{"header":{"message":"Fixing the bad changes in history (unfortunately, by rebooting).","description":null,"timestamp":"2020-11-16T16:49:16.630096597Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","authors":[],"deps":{"hashes":[["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["AA",null]],"deps":[],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"shell.nix","metadata":420},"context":[{"change":1,"pos":0}],"contents":[{"Add":"with import {};"},{"Add":""},{"Add":"pkgs.mkShell {"},{"Add":" name = \"pijul\";"},{"Add":""},{"Add":" nativeBuildInputs = with pkgs; ["},{"Add":" clang"},{"Add":" pkg-config"},{"Add":" ];"},{"Add":""},{"Add":" buildInputs = with pkgs; ["},{"Add":" rustc"},{"Add":" rustfmt"},{"Add":""},{"Add":" llvmPackages.libclang"},{"Add":" libsodium"},{"Add":" openssl"},{"Add":" xxHash"},{"Add":" zstd"},{"Add":" libgit2"},{"Add":" ] ++ (stdenv.lib.optionals stdenv.isDarwin ["},{"Add":" CoreServices"},{"Add":" Security"},{"Add":" ]);"},{"Add":""},{"Add":" LIBCLANG_PATH = \"${llvmPackages.libclang}/lib\";"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"pijul-macros","metadata":1005},"context":[{"change":1,"pos":0}],"contents":[]}},{"FileAdd":{"meta":{"basename":"src","metadata":1005},"context":[{"change":0,"pos":428}],"contents":[]}},{"FileAdd":{"meta":{"basename":"lib.rs","metadata":420},"context":[{"change":0,"pos":435}],"contents":[{"Add":"#![recursion_limit = \"256\"]"},{"Add":"extern crate proc_macro;"},{"Add":"extern crate proc_macro2;"},{"Add":"#[macro_use]"},{"Add":"extern crate quote;"},{"Add":""},{"Add":"use proc_macro::TokenStream;"},{"Add":"use proc_macro2::*;"},{"Add":""},{"Add":"use std::iter::FromIterator;"},{"Add":""},{"Add":"fn name_capital(name: &str) -> String {"},{"Add":" name.chars()"},{"Add":" .enumerate()"},{"Add":" .map(|(i, s)| {"},{"Add":" if i == 0 {"},{"Add":" s.to_uppercase().nth(0).unwrap()"},{"Add":" } else {"},{"Add":" s"},{"Add":" }"},{"Add":" })"},{"Add":" .collect()"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn table(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" let name_capital = syn::Ident::new(&name_capital(&name), Span::call_site());"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" type #name_capital;"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_table_get(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let name_get = syn::Ident::new(&format!(\"get_{}\", name), Span::call_site());"},{"Add":" let name = syn::Ident::new(&name, Span::call_site());"},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":""},{"Add":" let pre_ = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let pre = if !pre_.is_empty() {"},{"Add":" quote! {"},{"Add":" let (key, value) = #pre_;"},{"Add":" }"},{"Add":" } else {"},{"Add":" quote! {}"},{"Add":" };"},{"Add":" let post_ = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let post = if post_.is_empty() {"},{"Add":" quote! { self.txn.get(&self.#name, key, value) }"},{"Add":" } else {"},{"Add":" quote! { self.txn.get(&self.#name, key, value) . #post_ }"},{"Add":" };"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_get <'txn> (&'txn self, key: #key, value: Option<#value>) -> Option<#value> {"},{"Add":" use ::sanakirja::Transaction;"},{"Add":" #pre"},{"Add":" #post"},{"Add":" }"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_get(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let name_capital = syn::Ident::new(&name_capital(&name), Span::call_site());"},{"Add":" let name_get = syn::Ident::new(&format!(\"get_{}\", name), Span::call_site());"},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_get(&self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Option<#value> {"},{"Add":" use ::sanakirja::Transaction;"},{"Add":" self.txn.get(db, key, value)"},{"Add":" }"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn table_get(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let name_get = syn::Ident::new(&format!(\"get_{}\", name), Span::call_site());"},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_get<'txn>(&'txn self, key: #key, value: Option<#value>) -> Option<#value>;"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn get(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let name_capital = syn::Ident::new(&name_capital(&name), Span::call_site());"},{"Add":" let name_get = syn::Ident::new(&format!(\"get_{}\", name), Span::call_site());"},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_get<'txn>(&'txn self, db: &Self::#name_capital, key: #key, value: Option<#value>) -> Option<#value>;"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"fn next(input_iter: &mut proc_macro2::token_stream::IntoIter) -> Vec {"},{"Add":" let mut result = Vec::new();"},{"Add":" let mut is_first = true;"},{"Add":" loop {"},{"Add":" match input_iter.next() {"},{"Add":" Some(TokenTree::Punct(p)) => {"},{"Add":" if p.as_char() == ',' {"},{"Add":" if !is_first {"},{"Add":" return result;"},{"Add":" }"},{"Add":" } else {"},{"Add":" result.push(TokenTree::Punct(p))"},{"Add":" }"},{"Add":" }"},{"Add":" Some(e) => result.push(e),"},{"Add":" None => return result,"},{"Add":" }"},{"Add":" is_first = false"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn cursor(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" cursor_(input, false, false, false)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn cursor_ref(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" cursor_(input, false, false, true)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn iter(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" cursor_(input, false, true, false)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn rev_cursor(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" cursor_(input, true, false, false)"},{"Add":"}"},{"Add":""},{"Add":"fn cursor_(input: proc_macro::TokenStream, rev: bool, iter: bool, borrow: bool) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let capital = name_capital(&name);"},{"Add":" let cursor_name = syn::Ident::new(&format!(\"{}Cursor\", capital,), Span::call_site());"},{"Add":" let name_capital = syn::Ident::new(&name_capital(&name), Span::call_site());"},{"Add":" let name_iter = syn::Ident::new(&format!(\"iter_{}\", name), Span::call_site());"},{"Add":" let name_next = syn::Ident::new(&format!(\"cursor_{}_next\", name), Span::call_site());"},{"Add":" let name_prev = syn::Ident::new(&format!(\"cursor_{}_prev\", name), Span::call_site());"},{"Add":" let name_cursor = syn::Ident::new("},{"Add":" &format!(\"{}cursor_{}\", if rev { \"rev_\" } else { \"\" }, name),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":" let name_cursor_ref = syn::Ident::new("},{"Add":" &format!(\"{}cursor_{}_ref\", if rev { \"rev_\" } else { \"\" }, name),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":""},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let cursor_type = if rev {"},{"Add":" quote! {"},{"Add":" crate::pristine::RevCursor"},{"Add":" }"},{"Add":" } else {"},{"Add":" quote! {"},{"Add":" crate::pristine::Cursor"},{"Add":" }"},{"Add":" };"},{"Add":" let def = if rev {"},{"Add":" quote! {}"},{"Add":" } else {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" type #cursor_name;"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_next <'txn> ("},{"Add":" &'txn self,"},{"Add":" cursor: &mut Self::#cursor_name,"},{"Add":" ) -> Option<(#key, #value)>;"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_prev <'txn> ("},{"Add":" &'txn self,"},{"Add":" cursor: &mut Self::#cursor_name,"},{"Add":" ) -> Option<(#key, #value)>;"},{"Add":" }"},{"Add":" };"},{"Add":" let borrow = if borrow {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_cursor_ref>("},{"Add":" txn: RT,"},{"Add":" db: &Self::#name_capital,"},{"Add":" pos: Option<(#key, Option<#value>)>,"},{"Add":" ) -> crate::pristine::Cursor;"},{"Add":" }"},{"Add":" } else {"},{"Add":" quote! {}"},{"Add":" };"},{"Add":" let iter = if !iter {"},{"Add":" quote! {}"},{"Add":" } else {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_iter <'txn> ("},{"Add":" &'txn self,"},{"Add":" k: #key,"},{"Add":" v: Option<#value>"},{"Add":" ) -> #cursor_type;"},{"Add":" }"},{"Add":" };"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #def"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_cursor<'txn>("},{"Add":" &'txn self,"},{"Add":" db: &Self::#name_capital,"},{"Add":" pos: Option<(#key, Option<#value>)>,"},{"Add":" ) -> #cursor_type;"},{"Add":" #borrow"},{"Add":" #iter"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_cursor(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" sanakirja_cursor_(input, false, false, false)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_cursor_ref(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" sanakirja_cursor_(input, false, false, true)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_iter(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" sanakirja_cursor_(input, false, true, false)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_rev_cursor(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" sanakirja_cursor_(input, true, false, false)"},{"Add":"}"},{"Add":""},{"Add":"fn sanakirja_cursor_("},{"Add":" input: proc_macro::TokenStream,"},{"Add":" rev: bool,"},{"Add":" iter: bool,"},{"Add":" borrow: bool,"},{"Add":") -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let cursor_name = syn::Ident::new("},{"Add":" &format!(\"{}Cursor\", name_capital(&name),),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":""},{"Add":" let name_capital = syn::Ident::new(&name_capital(&name), Span::call_site());"},{"Add":" let name_next = syn::Ident::new(&format!(\"cursor_{}_next\", name), Span::call_site());"},{"Add":" let name_prev = syn::Ident::new(&format!(\"cursor_{}_prev\", name), Span::call_site());"},{"Add":" let name_cursor = syn::Ident::new("},{"Add":" &format!(\"{}cursor_{}\", if rev { \"rev_\" } else { \"\" }, name),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":" let name_cursor_ref = syn::Ident::new("},{"Add":" &format!(\"{}cursor_{}_ref\", if rev { \"rev_\" } else { \"\" }, name),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":" let name_iter = syn::Ident::new("},{"Add":" &format!(\"{}iter_{}\", if rev { \"rev_\" } else { \"\" }, name),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":""},{"Add":" let name = syn::Ident::new(&name, Span::call_site());"},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":""},{"Add":" let pre = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let post = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let pre_init = if !pre.is_empty() {"},{"Add":" quote! { let pos = #pre; }"},{"Add":" } else {"},{"Add":" quote! {}"},{"Add":" };"},{"Add":" let post = if !post.is_empty() {"},{"Add":" quote! { . #post }"},{"Add":" } else {"},{"Add":" quote! {}"},{"Add":" };"},{"Add":" let iter = if iter {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_iter <'txn> ("},{"Add":" &'txn self,"},{"Add":" k: #key,"},{"Add":" v: Option<#value>"},{"Add":" ) -> super::Cursor {"},{"Add":" self.#name_cursor(&self.#name, Some((k, v)))"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" quote! {}"},{"Add":" };"},{"Add":""},{"Add":" let borrow = if borrow {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_cursor_ref > ("},{"Add":" txn: RT,"},{"Add":" db: &Self::#name_capital,"},{"Add":" pos: Option<(#key, Option<#value>)>,"},{"Add":" ) -> super::Cursor {"},{"Add":" #pre_init"},{"Add":" let mut cursor = txn.txn.set_cursors(&db, pos).0;"},{"Add":" super::Cursor {"},{"Add":" cursor,"},{"Add":" txn,"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" quote! {}"},{"Add":" };"},{"Add":""},{"Add":" let result = proc_macro::TokenStream::from(if rev {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_cursor<'txn>("},{"Add":" &'txn self,"},{"Add":" db: &Self::#name_capital,"},{"Add":" pos: Option<(#key, Option<#value>)>,"},{"Add":" ) -> super::RevCursor {"},{"Add":" #pre_init"},{"Add":" let mut cursor = if pos.is_some() {"},{"Add":" self.txn.set_cursors(&db, pos).0"},{"Add":" } else {"},{"Add":" self.txn.set_cursors_last(&db)"},{"Add":" };"},{"Add":" super::RevCursor {"},{"Add":" cursor,"},{"Add":" txn: self,"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" type #cursor_name = ::sanakirja::Cursor;"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_cursor<'txn>("},{"Add":" &'txn self,"},{"Add":" db: &Self::#name_capital,"},{"Add":" pos: Option<(#key, Option<#value>)>,"},{"Add":" ) -> super::Cursor {"},{"Add":" #pre_init"},{"Add":" let mut cursor = self.txn.set_cursors(&db, pos).0;"},{"Add":" super::Cursor {"},{"Add":" cursor,"},{"Add":" txn: self,"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" }"},{"Add":" }"},{"Add":" #borrow"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_next <'txn> ("},{"Add":" &'txn self,"},{"Add":" cursor: &mut Self::#cursor_name,"},{"Add":" ) -> Option<(#key, #value)> {"},{"Add":" (unsafe { ::sanakirja::next(&self.txn, cursor) })"},{"Add":" #post"},{"Add":" }"},{"Add":" #[doc(hidden)]"},{"Add":" fn #name_prev <'txn> ("},{"Add":" &'txn self,"},{"Add":" cursor: &mut Self::#cursor_name,"},{"Add":" ) -> Option<(#key, #value)> {"},{"Add":" (unsafe { ::sanakirja::prev(&self.txn, cursor) })"},{"Add":" #post"},{"Add":" }"},{"Add":" #iter"},{"Add":" }"},{"Add":" });"},{"Add":" result"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn initialized_cursor(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" initialized_cursor_(input, false)"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn initialized_rev_cursor(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" initialized_cursor_(input, true)"},{"Add":"}"},{"Add":""},{"Add":"fn initialized_cursor_(input: proc_macro::TokenStream, rev: bool) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let cursor_name = syn::Ident::new("},{"Add":" &format!(\"{}Cursor\", name_capital(&name),),"},{"Add":" Span::call_site(),"},{"Add":" );"},{"Add":" let name_next = syn::Ident::new(&format!(\"cursor_{}_next\", name), Span::call_site());"},{"Add":" let name_prev = syn::Ident::new(&format!(\"cursor_{}_prev\", name), Span::call_site());"},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":""},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" if rev {"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" impl> Iterator for crate::pristine::RevCursor"},{"Add":" {"},{"Add":" type Item = (#key, #value);"},{"Add":" fn next(&mut self) -> Option<(#key, #value)> {"},{"Add":" self.txn.#name_prev(&mut self.cursor)"},{"Add":" }"},{"Add":" }"},{"Add":" })"},{"Add":" } else {"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":""},{"Add":" impl>"},{"Add":" crate::pristine::Cursor"},{"Add":" {"},{"Add":" pub fn prev(&mut self) -> Option<(#key, #value)> {"},{"Add":" self.txn.#name_prev(&mut self.cursor)"},{"Add":" }"},{"Add":" }"},{"Add":" impl> Iterator for crate::pristine::Cursor"},{"Add":" {"},{"Add":" type Item = (#key, #value);"},{"Add":" fn next(&mut self) -> Option<(#key, #value)> {"},{"Add":" self.txn.#name_next(&mut self.cursor)"},{"Add":" }"},{"Add":" }"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn put_del(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let put = syn::Ident::new(&format!(\"put_{}\", name), Span::call_site());"},{"Add":" let del = syn::Ident::new(&format!(\"del_{}\", name), Span::call_site());"},{"Add":""},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #put("},{"Add":" &mut self,"},{"Add":" k: #key,"},{"Add":" e: #value,"},{"Add":" ) -> Result;"},{"Add":" #[doc(hidden)]"},{"Add":" fn #del("},{"Add":" &mut self,"},{"Add":" k: #key,"},{"Add":" e: Option<#value>,"},{"Add":" ) -> Result;"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"#[proc_macro]"},{"Add":"pub fn sanakirja_put_del(input: proc_macro::TokenStream) -> TokenStream {"},{"Add":" let input = proc_macro2::TokenStream::from(input);"},{"Add":" let mut input_iter = input.into_iter();"},{"Add":" let name = match input_iter.next() {"},{"Add":" Some(TokenTree::Ident(id)) => id.to_string(),"},{"Add":" _ => panic!(\"txn_table: first argument not an identifier\"),"},{"Add":" };"},{"Add":" let put = syn::Ident::new(&format!(\"put_{}\", name), Span::call_site());"},{"Add":" let del = syn::Ident::new(&format!(\"del_{}\", name), Span::call_site());"},{"Add":" let name = syn::Ident::new(&name, Span::call_site());"},{"Add":""},{"Add":" let key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":""},{"Add":" let pre_key = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" let pre_value = proc_macro2::TokenStream::from_iter(next(&mut input_iter).into_iter());"},{"Add":" assert!(input_iter.next().is_none());"},{"Add":" if pre_key.is_empty() {"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #put("},{"Add":" &mut self,"},{"Add":" k: #key,"},{"Add":" v: #value,"},{"Add":" ) -> Result {"},{"Add":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v)?)"},{"Add":" }"},{"Add":" #[doc(hidden)]"},{"Add":" fn #del("},{"Add":" &mut self,"},{"Add":" k: #key,"},{"Add":" v: Option<#value>,"},{"Add":" ) -> Result {"},{"Add":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v)?)"},{"Add":" }"},{"Add":" })"},{"Add":" } else {"},{"Add":" proc_macro::TokenStream::from(quote! {"},{"Add":" #[doc(hidden)]"},{"Add":" fn #put("},{"Add":" &mut self,"},{"Add":" k: #key,"},{"Add":" v: #value,"},{"Add":" ) -> Result {"},{"Add":" let k = #pre_key;"},{"Add":" let v = #pre_value;"},{"Add":" Ok(self.txn.put(&mut self.rng, &mut self.#name, k, v)?)"},{"Add":" }"},{"Add":" #[doc(hidden)]"},{"Add":" fn #del("},{"Add":" &mut self,"},{"Add":" k: #key,"},{"Add":" v: Option<#value>,"},{"Add":" ) -> Result {"},{"Add":" let k = #pre_key;"},{"Add":" let v = v.map(|v| #pre_value);"},{"Add":" Ok(self.txn.del(&mut self.rng, &mut self.#name, k, v)?)"},{"Add":" }"},{"Add":" })"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"Cargo.toml","metadata":420},"context":[{"change":0,"pos":428}],"contents":[{"Add":"[package]"},{"Add":"name = \"pijul-macros\""},{"Add":"description = \"Macros used to write libpijul.\""},{"Add":"version = \"0.1.0\""},{"Add":"authors = [\"Pierre-Étienne Meunier \"]"},{"Add":"edition = \"2018\""},{"Add":"repository = \"https://nest.pijul.com/pijul/pijul\""},{"Add":"license = \"GPL-2.0\""},{"Add":"include = [ \"Cargo.toml\", \"src/lib.rs\" ]"},{"Add":"[lib]"},{"Add":"proc-macro = true"},{"Add":""},{"Add":"[dependencies]"},{"Add":"syn = \"1.0\""},{"Add":"quote = \"1.0\""},{"Add":"proc-macro2 = \"1.0\""},{"Add":"regex = \"1.4\""}]}},{"FileAdd":{"meta":{"basename":"pijul","metadata":1005},"context":[{"change":1,"pos":0}],"contents":[]}},{"FileAdd":{"meta":{"basename":"src","metadata":1005},"context":[{"change":0,"pos":21407}],"contents":[]}},{"FileAdd":{"meta":{"basename":"repository.rs","metadata":420},"context":[{"change":0,"pos":21414}],"contents":[{"Add":"use crate::{config, current_dir, Error};"},{"Add":"use libpijul::DOT_DIR;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"pub struct Repository {"},{"Add":" pub pristine: libpijul::pristine::sanakirja::Pristine,"},{"Add":" pub changes: libpijul::changestore::filesystem::FileSystem,"},{"Add":" pub working_copy: libpijul::working_copy::filesystem::FileSystem,"},{"Add":" pub config: config::Config,"},{"Add":" pub path: PathBuf,"},{"Add":" pub changes_dir: PathBuf,"},{"Add":"}"},{"Add":""},{"Add":"pub const PRISTINE_DIR: &'static str = \"pristine\";"},{"Add":"pub const CHANGES_DIR: &'static str = \"changes\";"},{"Add":"pub const CONFIG_FILE: &'static str = \"config\";"},{"Add":""},{"Add":"impl Repository {"},{"Add":" pub fn save_config(&self) -> Result<(), anyhow::Error> {"},{"Add":" let config = toml::to_string(&self.config)?;"},{"Add":" let mut file = std::fs::File::create(&self.path.join(DOT_DIR).join(CONFIG_FILE))?;"},{"Add":" file.write_all(config.as_bytes())?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn find_root_(cur: Option, dot_dir: &str) -> Result {"},{"Add":" let mut cur = if let Some(cur) = cur {"},{"Add":" cur"},{"Add":" } else {"},{"Add":" current_dir()?"},{"Add":" };"},{"Add":" cur.push(dot_dir);"},{"Add":" loop {"},{"Add":" debug!(\"{:?}\", cur);"},{"Add":" if std::fs::metadata(&cur).is_err() {"},{"Add":" cur.pop();"},{"Add":" if cur.pop() {"},{"Add":" cur.push(DOT_DIR);"},{"Add":" } else {"},{"Add":" return Err(Error::NoRepoRoot.into());"},{"Add":" }"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(cur)"},{"Add":" }"},{"Add":""},{"Add":" pub fn find_root(cur: Option) -> Result {"},{"Add":" Self::find_root_with_dot_dir(cur, DOT_DIR)"},{"Add":" }"},{"Add":""},{"Add":" pub fn find_root_with_dot_dir("},{"Add":" cur: Option,"},{"Add":" dot_dir: &str,"},{"Add":" ) -> Result {"},{"Add":" let cur = Self::find_root_(cur, dot_dir)?;"},{"Add":" let mut pristine_dir = cur.clone();"},{"Add":" pristine_dir.push(PRISTINE_DIR);"},{"Add":" let mut changes_dir = cur.clone();"},{"Add":" changes_dir.push(CHANGES_DIR);"},{"Add":" let mut working_copy_dir = cur.clone();"},{"Add":" working_copy_dir.pop();"},{"Add":" let config_path = cur.join(CONFIG_FILE);"},{"Add":" let config = if let Ok(config) = std::fs::read(&config_path) {"},{"Add":" if let Ok(toml) = toml::from_slice(&config) {"},{"Add":" toml"},{"Add":" } else {"},{"Add":" return Err((crate::Error::CouldNotReadConfig { path: config_path }).into());"},{"Add":" }"},{"Add":" } else {"},{"Add":" config::Config::default()"},{"Add":" };"},{"Add":" Ok(Repository {"},{"Add":" pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir)?,"},{"Add":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root("},{"Add":" &working_copy_dir,"},{"Add":" ),"},{"Add":" changes: libpijul::changestore::filesystem::FileSystem::from_root(&working_copy_dir),"},{"Add":" config,"},{"Add":" path: working_copy_dir,"},{"Add":" changes_dir,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" pub fn init(path: Option) -> Result {"},{"Add":" let cur = if let Some(path) = path {"},{"Add":" path"},{"Add":" } else {"},{"Add":" current_dir()?"},{"Add":" };"},{"Add":" let mut pristine_dir = cur.clone();"},{"Add":" pristine_dir.push(DOT_DIR);"},{"Add":" pristine_dir.push(PRISTINE_DIR);"},{"Add":" if std::fs::metadata(&pristine_dir).is_err() {"},{"Add":" std::fs::create_dir_all(&pristine_dir)?;"},{"Add":" let mut changes_dir = cur.clone();"},{"Add":" changes_dir.push(DOT_DIR);"},{"Add":" changes_dir.push(CHANGES_DIR);"},{"Add":" Ok(Repository {"},{"Add":" pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir)?,"},{"Add":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(&cur),"},{"Add":" changes: libpijul::changestore::filesystem::FileSystem::from_root(&cur),"},{"Add":" config: config::Config::default(),"},{"Add":" path: cur,"},{"Add":" changes_dir,"},{"Add":" })"},{"Add":" } else {"},{"Add":" Err(Error::AlreadyInARepo.into())"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"remote","metadata":1005},"context":[{"change":0,"pos":21414}],"contents":[]}},{"FileAdd":{"meta":{"basename":"ssh.rs","metadata":420},"context":[{"change":0,"pos":25370}],"contents":[{"Add":"use super::{parse_line, RemoteRef};"},{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use byteorder::{BigEndian, ReadBytesExt};"},{"Add":"use libpijul::pristine::{Base32, ChannelRef, Hash, Merkle, MutTxnT};"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use regex::Regex;"},{"Add":"use std::borrow::Cow;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::{Path, PathBuf};"},{"Add":"use std::sync::Arc;"},{"Add":"use std::time::{Duration, SystemTime};"},{"Add":"use thrussh::client::Session;"},{"Add":""},{"Add":"pub struct Ssh {"},{"Add":" pub h: thrussh::client::Handle,"},{"Add":" pub c: thrussh::client::Channel,"},{"Add":" pub channel: String,"},{"Add":" pub remote_cmd: String,"},{"Add":" pub path: String,"},{"Add":" pub is_running: bool,"},{"Add":" pub name: String,"},{"Add":"}"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref ADDRESS: Regex = Regex::new("},{"Add":" r#\"(ssh://)?((?P[^@]+)@)?((?P(\\[([^\\]]+)\\])|([^:/]+)))((:(?P\\d+)/)|:|/)(?P.+)\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"pub struct Remote<'a> {"},{"Add":" host: &'a str,"},{"Add":" port: u16,"},{"Add":" user: Cow<'a, str>,"},{"Add":" path: &'a str,"},{"Add":" addr: String,"},{"Add":" resolved: std::net::SocketAddr,"},{"Add":"}"},{"Add":""},{"Add":"pub fn ssh_remote<'a>(addr: &'a str) -> Option> {"},{"Add":" let cap = if let Some(cap) = ADDRESS.captures(addr) {"},{"Add":" cap"},{"Add":" } else {"},{"Add":" return None;"},{"Add":" };"},{"Add":" debug!(\"ssh_remote: {:?}\", cap);"},{"Add":" let user = if let Some(u) = cap.name(\"user\") {"},{"Add":" Cow::Borrowed(u.as_str())"},{"Add":" } else {"},{"Add":" Cow::Owned(whoami::username())"},{"Add":" };"},{"Add":" let host = cap.name(\"host\").unwrap().as_str();"},{"Add":" let port: u16 = cap"},{"Add":" .name(\"port\")"},{"Add":" .map(|x| x.as_str().parse().unwrap())"},{"Add":" .unwrap_or(22);"},{"Add":" let path = cap.name(\"path\").unwrap().as_str();"},{"Add":" let addr = format!(\"{}:{}\", host, port);"},{"Add":" use std::net::ToSocketAddrs;"},{"Add":" if let Ok(mut res) = addr.to_socket_addrs() {"},{"Add":" let resolved = res.next().unwrap();"},{"Add":" Some(Remote {"},{"Add":" host,"},{"Add":" port,"},{"Add":" user,"},{"Add":" path,"},{"Add":" addr,"},{"Add":" resolved,"},{"Add":" })"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> Remote<'a> {"},{"Add":" pub async fn connect(&self, name: &str, channel: &str) -> Result {"},{"Add":" let mut home = dirs_next::home_dir().unwrap();"},{"Add":" home.push(\".ssh\");"},{"Add":" home.push(\"known_hosts\");"},{"Add":" let client = SshClient {"},{"Add":" addr: self.addr.clone(),"},{"Add":" known_hosts: home,"},{"Add":" last_window_adjustment: SystemTime::now(),"},{"Add":" };"},{"Add":" let config = Arc::new(thrussh::client::Config::default());"},{"Add":" use std::net::ToSocketAddrs;"},{"Add":" debug!(\"client: {:?}\", client.addr);"},{"Add":" let addr = client.addr.to_socket_addrs()?.next().unwrap();"},{"Add":" let mut h = thrussh::client::connect(config, &addr, client).await?;"},{"Add":""},{"Add":" let mut key_path = dirs_next::home_dir().unwrap().join(\".ssh\");"},{"Add":""},{"Add":" // First try agent auth"},{"Add":" let authenticated = self.auth_agent(&mut h).await.unwrap_or(false)"},{"Add":" || self.auth_pk(&mut h, &mut key_path).await"},{"Add":" || self.auth_password(&mut h).await?;"},{"Add":""},{"Add":" if !authenticated {"},{"Add":" return Err(Error::NotAuthenticated.into());"},{"Add":" }"},{"Add":""},{"Add":" let c = h.channel_open_session().await?;"},{"Add":" let remote_cmd = if let Ok(cmd) = std::env::var(\"REMOTE_PIJUL\") {"},{"Add":" cmd"},{"Add":" } else {"},{"Add":" \"pijul\".to_string()"},{"Add":" };"},{"Add":" Ok(Ssh {"},{"Add":" h,"},{"Add":" c,"},{"Add":" channel: channel.to_string(),"},{"Add":" remote_cmd,"},{"Add":" path: self.path.to_string(),"},{"Add":" is_running: false,"},{"Add":" name: name.to_string(),"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" async fn auth_agent(&self, h: &mut thrussh::client::Handle) -> Result {"},{"Add":" let mut authenticated = false;"},{"Add":" let mut agent = thrussh_keys::agent::client::AgentClient::connect_env().await?;"},{"Add":" let identities = agent.request_identities().await?;"},{"Add":" debug!(\"identities = {:?}\", identities);"},{"Add":" let mut agent = Some(agent);"},{"Add":" for key in identities {"},{"Add":" debug!(\"Trying key {:?}\", key);"},{"Add":" let fingerprint = key.fingerprint();"},{"Add":" if let Some(a) = agent.take() {"},{"Add":" debug!(\"authenticate future\");"},{"Add":" match h.authenticate_future(self.user.as_ref(), key, a).await {"},{"Add":" Ok((a, auth)) => {"},{"Add":" if !auth {"},{"Add":" writeln!("},{"Add":" std::io::stderr(),"},{"Add":" \"Key {:?} (with agent) rejected\","},{"Add":" fingerprint"},{"Add":" )?"},{"Add":" }"},{"Add":" debug!(\"auth\");"},{"Add":" authenticated = auth;"},{"Add":" agent = Some(a);"},{"Add":" }"},{"Add":" Err(e) => {"},{"Add":" debug!(\"not auth {:?}\", e);"},{"Add":" if let Ok(thrussh_keys::Error::AgentFailure) = e.downcast() {"},{"Add":" writeln!(std::io::stderr(), \"Failed to sign with agent\")?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if authenticated {"},{"Add":" return Ok(true);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(false)"},{"Add":" }"},{"Add":""},{"Add":" async fn auth_pk(&self, h: &mut thrussh::client::Handle, key_path: &mut PathBuf) -> bool {"},{"Add":" let mut authenticated = false;"},{"Add":" for k in &[\"id_ed25519\", \"id_rsa\"] {"},{"Add":" key_path.push(k);"},{"Add":" let k = if let Some(k) = load_secret_key(&key_path, k) {"},{"Add":" k"},{"Add":" } else {"},{"Add":" key_path.pop();"},{"Add":" continue;"},{"Add":" };"},{"Add":" if let Ok(auth) = h"},{"Add":" .authenticate_publickey(self.user.as_ref(), Arc::new(k))"},{"Add":" .await"},{"Add":" {"},{"Add":" authenticated = auth"},{"Add":" }"},{"Add":" key_path.pop();"},{"Add":" if authenticated {"},{"Add":" return true;"},{"Add":" }"},{"Add":" }"},{"Add":" false"},{"Add":" }"},{"Add":""},{"Add":" async fn auth_password(&self, h: &mut thrussh::client::Handle) -> Result {"},{"Add":" let pass = rpassword::read_password_from_tty(Some(&format!("},{"Add":" \"Password for {}@{}: \","},{"Add":" self.user, self.host"},{"Add":" )))?;"},{"Add":" h.authenticate_password(self.user.to_string(), &pass).await"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn load_secret_key(key_path: &Path, k: &str) -> Option {"},{"Add":" match thrussh_keys::load_secret_key(&key_path, None) {"},{"Add":" Ok(k) => Some(k),"},{"Add":" Err(e) => {"},{"Add":" if let Ok(thrussh_keys::Error::KeyIsEncrypted) = e.downcast() {"},{"Add":" let pass = if let Ok(pass) ="},{"Add":" rpassword::read_password_from_tty(Some(&format!(\"Password for key {:?}: \", k)))"},{"Add":" {"},{"Add":" pass"},{"Add":" } else {"},{"Add":" return None;"},{"Add":" };"},{"Add":" if pass.is_empty() {"},{"Add":" return None;"},{"Add":" }"},{"Add":" if let Ok(k) = thrussh_keys::load_secret_key(&key_path, Some(pass.as_bytes())) {"},{"Add":" return Some(k);"},{"Add":" }"},{"Add":" }"},{"Add":" None"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct SshClient {"},{"Add":" addr: String,"},{"Add":" known_hosts: PathBuf,"},{"Add":" last_window_adjustment: SystemTime,"},{"Add":"}"},{"Add":""},{"Add":"impl thrussh::client::Handler for SshClient {"},{"Add":" type FutureBool = futures::future::Ready>;"},{"Add":" type FutureUnit = futures::future::Ready>;"},{"Add":" fn finished_bool(self, b: bool) -> Self::FutureBool {"},{"Add":" futures::future::ready(Ok((self, b)))"},{"Add":" }"},{"Add":" fn finished(self, session: Session) -> Self::FutureUnit {"},{"Add":" futures::future::ready(Ok((self, session)))"},{"Add":" }"},{"Add":" fn check_server_key("},{"Add":" self,"},{"Add":" server_public_key: &thrussh_keys::key::PublicKey,"},{"Add":" ) -> Self::FutureBool {"},{"Add":" let mut it = self.addr.split(':');"},{"Add":" let addr = it.next().unwrap();"},{"Add":" let port = it.next().unwrap_or(\"22\").parse().unwrap();"},{"Add":" match thrussh_keys::check_known_hosts_path(addr, port, server_public_key, &self.known_hosts)"},{"Add":" {"},{"Add":" Ok(e) => {"},{"Add":" if e {"},{"Add":" futures::future::ready(Ok((self, true)))"},{"Add":" } else {"},{"Add":" match learn(addr, port, server_public_key) {"},{"Add":" Ok(x) => futures::future::ready(Ok((self, x))),"},{"Add":" Err(e) => futures::future::ready(Err(e)),"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Err(e) => {"},{"Add":" error!(\"Key changed for {:?}\", self.addr);"},{"Add":" futures::future::ready(Err(e))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn adjust_window(&mut self, _channel: thrussh::ChannelId, target: u32) -> u32 {"},{"Add":" let elapsed = self.last_window_adjustment.elapsed().unwrap();"},{"Add":" self.last_window_adjustment = SystemTime::now();"},{"Add":" if target >= 10_000_000 {"},{"Add":" return target;"},{"Add":" }"},{"Add":" if elapsed < Duration::from_secs(2) {"},{"Add":" target * 2"},{"Add":" } else if elapsed > Duration::from_secs(8) {"},{"Add":" target / 2"},{"Add":" } else {"},{"Add":" target"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn learn(addr: &str, port: u16, pk: &thrussh_keys::key::PublicKey) -> Result {"},{"Add":" if port == 22 {"},{"Add":" print!("},{"Add":" \"Unknown key for {:?}, fingerprint {:?}. Learn it (y/N)? \","},{"Add":" addr,"},{"Add":" pk.fingerprint()"},{"Add":" );"},{"Add":" } else {"},{"Add":" print!("},{"Add":" \"Unknown key for {:?}:{}, fingerprint {:?}. Learn it (y/N)? \","},{"Add":" addr,"},{"Add":" port,"},{"Add":" pk.fingerprint()"},{"Add":" );"},{"Add":" }"},{"Add":" std::io::stdout().flush()?;"},{"Add":" let mut buffer = String::new();"},{"Add":" std::io::stdin().read_line(&mut buffer)?;"},{"Add":" let buffer = buffer.trim();"},{"Add":" if buffer == \"Y\" || buffer == \"y\" {"},{"Add":" thrussh_keys::learn_known_hosts(addr, port, pk)?;"},{"Add":" Ok(true)"},{"Add":" } else {"},{"Add":" Ok(false)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Ssh {"},{"Add":" pub async fn finish(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.c.eof().await?;"},{"Add":" while let Some(msg) = self.c.wait().await {"},{"Add":" debug!(\"msg = {:?}\", msg);"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Data { .. } => {}"},{"Add":" thrussh::ChannelMsg::ExtendedData { data, ext } => {"},{"Add":" debug!(\"{:?} {:?}\", ext, std::str::from_utf8(&data[..]));"},{"Add":" if let Ok(data) = std::str::from_utf8(&data) {"},{"Add":" writeln!(std::io::stderr(), \"{}\", data)?;"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::WindowAdjusted { .. } => {}"},{"Add":" thrussh::ChannelMsg::Eof => {}"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" if exit_status != 0 {"},{"Add":" return Err((Error::RemoteExit {"},{"Add":" status: exit_status,"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" }"},{"Add":" msg => error!(\"wrong message {:?}\", msg),"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn get_state("},{"Add":" &mut self,"},{"Add":" mid: Option,"},{"Add":" ) -> Result, anyhow::Error> {"},{"Add":" self.run_protocol().await?;"},{"Add":" if let Some(mid) = mid {"},{"Add":" self.c"},{"Add":" .data(format!(\"state {} {}\\n\", self.channel, mid).as_bytes())"},{"Add":" .await?;"},{"Add":" } else {"},{"Add":" self.c"},{"Add":" .data(format!(\"state {}\\n\", self.channel).as_bytes())"},{"Add":" .await?;"},{"Add":" }"},{"Add":" while let Some(msg) = self.c.wait().await {"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Data { data } => {"},{"Add":" // If we can't parse `data` (for example if the"},{"Add":" // remote returns the standard \"-\\n\"), this"},{"Add":" // returns None."},{"Add":" let mut s = std::str::from_utf8(&data)?.split(' ');"},{"Add":" debug!(\"s = {:?}\", s);"},{"Add":" if let (Some(n), Some(m)) = (s.next(), s.next()) {"},{"Add":" let n = n.parse().unwrap();"},{"Add":" return Ok(Some((n, Merkle::from_base32(m.trim().as_bytes()).unwrap())));"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::ExtendedData { data, ext } => {"},{"Add":" if ext == 1 {"},{"Add":" debug!(\"{:?}\", std::str::from_utf8(&data))"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::Eof => {}"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" if exit_status != 0 {"},{"Add":" return Err((Error::RemoteExit {"},{"Add":" status: exit_status,"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" }"},{"Add":" msg => panic!(\"wrong message {:?}\", msg),"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":""},{"Add":" pub async fn archive("},{"Add":" &mut self,"},{"Add":" prefix: Option,"},{"Add":" state: Option<(Merkle, &[Hash])>,"},{"Add":" mut w: W,"},{"Add":" ) -> Result {"},{"Add":" self.run_protocol().await?;"},{"Add":" if let Some((ref state, ref extra)) = state {"},{"Add":" let mut cmd = format!(\"archive {} {}\", self.channel, state.to_base32(),);"},{"Add":" for e in extra.iter() {"},{"Add":" cmd.push_str(&format!(\" {}\", e.to_base32()));"},{"Add":" }"},{"Add":" if let Some(ref p) = prefix {"},{"Add":" cmd.push_str(\" :\");"},{"Add":" cmd.push_str(p)"},{"Add":" }"},{"Add":" cmd.push('\\n');"},{"Add":" self.c.data(cmd.as_bytes()).await?;"},{"Add":" } else {"},{"Add":" self.c"},{"Add":" .data("},{"Add":" format!("},{"Add":" \"archive {}{}{}\\n\","},{"Add":" self.channel,"},{"Add":" if prefix.is_some() { \" :\" } else { \"\" },"},{"Add":" prefix.unwrap_or(String::new())"},{"Add":" )"},{"Add":" .as_bytes(),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" }"},{"Add":" let mut len = 0;"},{"Add":" let mut conflicts = 0;"},{"Add":" let mut len_n = 0;"},{"Add":" while let Some(msg) = self.c.wait().await {"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Data { data } => {"},{"Add":" let mut off = 0;"},{"Add":" while len_n < 16 && off < data.len() {"},{"Add":" if len_n < 8 {"},{"Add":" len = (len << 8) | (data[off] as u64);"},{"Add":" } else {"},{"Add":" conflicts = (conflicts << 8) | (data[off] as u64);"},{"Add":" }"},{"Add":" len_n += 1;"},{"Add":" off += 1;"},{"Add":" }"},{"Add":" if len_n >= 16 {"},{"Add":" w.write_all(&data[off..])?;"},{"Add":" len -= (data.len() - off) as u64;"},{"Add":" if len == 0 {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::ExtendedData { data, ext } => {"},{"Add":" if ext == 1 {"},{"Add":" debug!(\"{:?}\", std::str::from_utf8(&data))"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::Eof => {}"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" if exit_status != 0 {"},{"Add":" return Err((Error::RemoteExit {"},{"Add":" status: exit_status,"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" }"},{"Add":" msg => panic!(\"wrong message {:?}\", msg),"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(conflicts)"},{"Add":" }"},{"Add":""},{"Add":" pub async fn run_protocol(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" if !self.is_running {"},{"Add":" self.is_running = true;"},{"Add":" debug!(\"run_protocol\");"},{"Add":" self.c"},{"Add":" .exec("},{"Add":" true,"},{"Add":" format!("},{"Add":" \"{} protocol --version {} --repository {}\","},{"Add":" self.remote_cmd,"},{"Add":" crate::PROTOCOL_VERSION,"},{"Add":" self.path"},{"Add":" ),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" while let Some(msg) = self.c.wait().await {"},{"Add":" debug!(\"msg = {:?}\", msg);"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Success => break,"},{"Add":" thrussh::ChannelMsg::WindowAdjusted { .. } => {}"},{"Add":" thrussh::ChannelMsg::Eof => {}"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" if exit_status != 0 {"},{"Add":" return Err((Error::RemoteExit {"},{"Add":" status: exit_status,"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" }"},{"Add":" _ => {}"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"run_protocol done\");"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn download_changelist("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" remote: &mut RemoteRef,"},{"Add":" from: u64,"},{"Add":" paths: &[String],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.run_protocol().await?;"},{"Add":" debug!(\"download_changelist\");"},{"Add":" let mut command = Vec::new();"},{"Add":" write!(command, \"changelist {} {}\", self.channel, from).unwrap();"},{"Add":" for p in paths {"},{"Add":" write!(command, \" {}\", p).unwrap()"},{"Add":" }"},{"Add":" command.push(b'\\n');"},{"Add":" self.c.data(&command[..]).await?;"},{"Add":" debug!(\"waiting ssh\");"},{"Add":" 'msg: while let Some(msg) = self.c.wait().await {"},{"Add":" debug!(\"msg = {:?}\", msg);"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Data { data } => {"},{"Add":" if &data[..] == b\"\\n\" {"},{"Add":" debug!(\"log done\");"},{"Add":" break;"},{"Add":" } else if let Ok(data) = std::str::from_utf8(&data) {"},{"Add":" for l in data.lines() {"},{"Add":" if !l.is_empty() {"},{"Add":" debug!(\"line = {:?}\", l);"},{"Add":" let (n, h, m) = parse_line(l)?;"},{"Add":" txn.put_remote(remote, n, (h, m))?;"},{"Add":" } else {"},{"Add":" break 'msg;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::ExtendedData { data, ext } => {"},{"Add":" debug!(\"{:?} {:?}\", ext, std::str::from_utf8(&data[..]));"},{"Add":" /*return Err((crate::Error::Remote {"},{"Add":" msg: std::str::from_utf8(&data[..]).unwrap().to_string()"},{"Add":" }).into())*/"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::WindowAdjusted { .. } => {}"},{"Add":" thrussh::ChannelMsg::Eof => {}"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" if exit_status != 0 {"},{"Add":" return Err((Error::RemoteExit {"},{"Add":" status: exit_status,"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" }"},{"Add":" msg => panic!(\"wrong message {:?}\", msg),"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"no msg\");"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn upload_changes("},{"Add":" &mut self,"},{"Add":" mut local: PathBuf,"},{"Add":" to_channel: Option<&str>,"},{"Add":" changes: &[Hash],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.run_protocol().await?;"},{"Add":" debug!(\"upload_changes\");"},{"Add":" for c in changes {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut local, &c);"},{"Add":" let mut change_file = std::fs::File::open(&local)?;"},{"Add":" let change_len = change_file.metadata()?.len();"},{"Add":" let mut change = cryptovec::CryptoVec::new_zeroed(change_len as usize);"},{"Add":" use std::io::Read;"},{"Add":" change_file.read_exact(&mut change[..])?;"},{"Add":" let to_channel = if let Some(t) = to_channel {"},{"Add":" t"},{"Add":" } else {"},{"Add":" self.channel.as_str()"},{"Add":" };"},{"Add":" self.c"},{"Add":" .data(format!(\"apply {} {} {}\\n\", to_channel, c.to_base32(), change_len).as_bytes())"},{"Add":" .await?;"},{"Add":" self.c.data(&change[..]).await?;"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn start_change_download("},{"Add":" &mut self,"},{"Add":" c: libpijul::pristine::Hash,"},{"Add":" full: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.run_protocol().await?;"},{"Add":" debug!(\"download_change {:?}\", full);"},{"Add":" if full {"},{"Add":" self.c"},{"Add":" .data(format!(\"change {}\\n\", c.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" } else {"},{"Add":" self.c"},{"Add":" .data(format!(\"partial {}\\n\", c.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn wait_downloads("},{"Add":" &mut self,"},{"Add":" changes_dir: &Path,"},{"Add":" hashes: &[libpijul::pristine::Hash],"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"wait_downloads\");"},{"Add":" if !self.is_running {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" let mut remaining_len = 0;"},{"Add":" let mut current: usize = 0;"},{"Add":" let mut path = changes_dir.to_path_buf();"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut path, &hashes[current]);"},{"Add":" std::fs::create_dir_all(&path.parent().unwrap())?;"},{"Add":" path.set_extension(\"\");"},{"Add":" let mut file = std::fs::File::create(&path)?;"},{"Add":" 'outer: while let Some(msg) = self.c.wait().await {"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Data { data } => {"},{"Add":" debug!(\"data = {:?}\", &data[..]);"},{"Add":" let mut p = 0;"},{"Add":" while p < data.len() {"},{"Add":" if remaining_len == 0 {"},{"Add":" remaining_len = (&data[p..]).read_u64::().unwrap() as usize;"},{"Add":" p += 8;"},{"Add":" debug!(\"remaining_len = {:?}\", remaining_len);"},{"Add":" }"},{"Add":" if data.len() >= p + remaining_len {"},{"Add":" file.write_all(&data[p..p + remaining_len])?;"},{"Add":" // We have enough data to write the"},{"Add":" // file, write it and move to the next"},{"Add":" // file."},{"Add":" p += remaining_len;"},{"Add":" remaining_len = 0;"},{"Add":" file.flush()?;"},{"Add":" let mut final_path = path.clone();"},{"Add":" final_path.set_extension(\"change\");"},{"Add":" debug!(\"moving {:?} to {:?}\", path, final_path);"},{"Add":" std::fs::rename(&path, &final_path)?;"},{"Add":" debug!(\"sending\");"},{"Add":" send.send(hashes[current].clone()).await.unwrap();"},{"Add":" debug!(\"sent\");"},{"Add":" current += 1;"},{"Add":" if current < hashes.len() {"},{"Add":" // If we're still waiting for"},{"Add":" // another change."},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut path);"},{"Add":" libpijul::changestore::filesystem::push_filename("},{"Add":" &mut path,"},{"Add":" &hashes[current],"},{"Add":" );"},{"Add":" std::fs::create_dir_all(&path.parent().unwrap())?;"},{"Add":" path.set_extension(\"\");"},{"Add":" file = std::fs::File::create(&path)?;"},{"Add":" } else {"},{"Add":" // Else, just finish."},{"Add":" break 'outer;"},{"Add":" }"},{"Add":" } else {"},{"Add":" // not enough data, we need more."},{"Add":" file.write_all(&data[p..])?;"},{"Add":" remaining_len -= data.len() - p;"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" debug!(\"exit: {:?}\", exit_status);"},{"Add":" if exit_status != 0 {"},{"Add":" error!(\"Remote command returned {:?}\", exit_status)"},{"Add":" }"},{"Add":" self.is_running = false;"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" msg => {"},{"Add":" debug!(\"{:?}\", msg);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"done waiting for downloads\");"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_channel("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" lazy: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.run_protocol().await?;"},{"Add":" self.c"},{"Add":" .data(format!(\"channel {}\\n\", self.channel).as_bytes())"},{"Add":" .await?;"},{"Add":" let from_dump_alive = {"},{"Add":" let mut from_dump ="},{"Add":" libpijul::pristine::channel_dump::ChannelFromDump::new(txn, channel.clone());"},{"Add":" while let Some(msg) = self.c.wait().await {"},{"Add":" match msg {"},{"Add":" thrussh::ChannelMsg::Data { data } => {"},{"Add":" debug!(\"data = {:?}\", &data[..]);"},{"Add":" if from_dump.read(&data)? {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::ExtendedData { data, ext } => {"},{"Add":" debug!(\"data = {:?}, ext = {:?}\", &data[..], ext);"},{"Add":" }"},{"Add":" thrussh::ChannelMsg::ExitStatus { exit_status } => {"},{"Add":" if exit_status != 0 {"},{"Add":" error!(\"Remote command returned {:?}\", exit_status)"},{"Add":" }"},{"Add":" self.is_running = false;"},{"Add":" break;"},{"Add":" }"},{"Add":" msg => {"},{"Add":" debug!(\"msg = {:?}\", msg);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" from_dump.alive"},{"Add":" };"},{"Add":" let channel_ = channel.borrow();"},{"Add":" debug!(\"cloned, now downloading changes\");"},{"Add":" let mut hashes = Vec::new();"},{"Add":" if lazy {"},{"Add":" for &ch in from_dump_alive.iter() {"},{"Add":" let h = txn.get_external(ch).unwrap();"},{"Add":" self.c"},{"Add":" .data(format!(\"change {}\\n\", h.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" hashes.push(h);"},{"Add":" }"},{"Add":" } else {"},{"Add":" for (_, (ch, _)) in txn.changeid_log(&channel_, 0) {"},{"Add":" let h = txn.get_external(ch).unwrap();"},{"Add":" self.c"},{"Add":" .data(format!(\"change {}\\n\", h.to_base32()).as_bytes())"},{"Add":" .await?;"},{"Add":" hashes.push(h);"},{"Add":" }"},{"Add":" }"},{"Add":" std::mem::drop(channel_);"},{"Add":" debug!(\"hashes = {:?}\", hashes);"},{"Add":" let (mut send, recv) = tokio::sync::mpsc::channel(100);"},{"Add":" self.wait_downloads(&repo.changes_dir, &hashes, &mut send)"},{"Add":" .await?;"},{"Add":" txn.output_repository_no_pending(&mut repo.working_copy, &repo.changes, channel, \"\", true)?;"},{"Add":" std::mem::drop(recv);"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"mod.rs","metadata":420},"context":[{"change":0,"pos":25370}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use crate::Error;"},{"Add":"use libpijul::pristine::{Base32, ChannelRef, Hash, Merkle, MutTxnT, RemoteRef};"},{"Add":"use libpijul::DOT_DIR;"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::io::Write;"},{"Add":"use std::path::{Path, PathBuf};"},{"Add":""},{"Add":"pub mod ssh;"},{"Add":"use ssh::*;"},{"Add":""},{"Add":"pub mod local;"},{"Add":"use local::*;"},{"Add":""},{"Add":"pub enum RemoteRepo {"},{"Add":" Local(Local),"},{"Add":" Ssh(Ssh),"},{"Add":" Http(Http),"},{"Add":" None,"},{"Add":"}"},{"Add":""},{"Add":"pub struct Http {"},{"Add":" pub url: String,"},{"Add":" pub channel: String,"},{"Add":" pub client: reqwest::Client,"},{"Add":" pub name: String,"},{"Add":"}"},{"Add":""},{"Add":"impl Repository {"},{"Add":" pub async fn remote("},{"Add":" &self,"},{"Add":" name: &str,"},{"Add":" channel: &str,"},{"Add":" no_cert_check: bool,"},{"Add":" ) -> Result {"},{"Add":" if let Some(name) = self.config.remotes.get(name) {"},{"Add":" unknown_remote(name, channel, no_cert_check).await"},{"Add":" } else {"},{"Add":" unknown_remote(name, channel, no_cert_check).await"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub async fn unknown_remote("},{"Add":" name: &str,"},{"Add":" channel: &str,"},{"Add":" no_cert_check: bool,"},{"Add":") -> Result {"},{"Add":" if name.starts_with(\"http://\") || name.starts_with(\"https://\") {"},{"Add":" debug!(\"unknown_remote, http = {:?}\", name);"},{"Add":" Ok(RemoteRepo::Http(Http {"},{"Add":" url: name.to_string(),"},{"Add":" channel: channel.to_string(),"},{"Add":" client: reqwest::ClientBuilder::new()"},{"Add":" .danger_accept_invalid_certs(no_cert_check)"},{"Add":" .build()?,"},{"Add":" name: name.to_string(),"},{"Add":" }))"},{"Add":" } else if name.starts_with(\"ssh://\") {"},{"Add":" if let Some(ssh) = ssh_remote(name) {"},{"Add":" debug!(\"unknown_remote, ssh = {:?}\", ssh);"},{"Add":" Ok(RemoteRepo::Ssh(ssh.connect(name, channel).await?))"},{"Add":" } else {"},{"Add":" Err((Error::RemoteNotFound {"},{"Add":" remote: name.to_string(),"},{"Add":" })"},{"Add":" .into())"},{"Add":" }"},{"Add":" } else {"},{"Add":" let mut dot_dir = Path::new(name).join(DOT_DIR);"},{"Add":" let changes_dir = dot_dir.join(CHANGES_DIR);"},{"Add":""},{"Add":" dot_dir.push(PRISTINE_DIR);"},{"Add":" debug!(\"dot_dir = {:?}\", dot_dir);"},{"Add":" if let Ok(pristine) = libpijul::pristine::sanakirja::Pristine::new(&dot_dir) {"},{"Add":" debug!(\"pristine done\");"},{"Add":" Ok(RemoteRepo::Local(Local {"},{"Add":" channel: channel.to_string(),"},{"Add":" changes_dir,"},{"Add":" pristine,"},{"Add":" root: Path::new(name).to_path_buf(),"},{"Add":" name: name.to_string(),"},{"Add":" }))"},{"Add":" } else if let Some(ssh) = ssh_remote(name) {"},{"Add":" debug!(\"unknown_remote, ssh = {:?}\", ssh);"},{"Add":" Ok(RemoteRepo::Ssh(ssh.connect(name, channel).await?))"},{"Add":" } else {"},{"Add":" Err((Error::RemoteNotFound {"},{"Add":" remote: name.to_string(),"},{"Add":" })"},{"Add":" .into())"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl RemoteRepo {"},{"Add":" fn name(&self) -> &str {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Ssh(ref s) => s.name.as_str(),"},{"Add":" RemoteRepo::Local(ref l) => l.name.as_str(),"},{"Add":" RemoteRepo::Http(ref h) => h.name.as_str(),"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn repo_name(&self) -> Option {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Ssh(ref s) => {"},{"Add":" if let Some(sep) = s.name.rfind(|c| c == ':' || c == '/') {"},{"Add":" Some(s.name.split_at(sep + 1).1.to_string())"},{"Add":" } else {"},{"Add":" Some(s.name.as_str().to_string())"},{"Add":" }"},{"Add":" }"},{"Add":" RemoteRepo::Local(ref l) => {"},{"Add":" if let Some(file) = l.root.file_name() {"},{"Add":" Some(file.to_str().unwrap().to_string())"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" }"},{"Add":" RemoteRepo::Http(ref h) => {"},{"Add":" let url = reqwest::Url::parse(&h.url).unwrap();"},{"Add":" if let Some(name) = libpijul::path::file_name(url.path()) {"},{"Add":" Some(name.to_string())"},{"Add":" } else {"},{"Add":" url.host().map(|h| h.to_string())"},{"Add":" }"},{"Add":" }"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub async fn finish(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.finish().await?,"},{"Add":" _ => {}"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn update_changelist("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" path: &[String],"},{"Add":" ) -> Result, anyhow::Error> {"},{"Add":" debug!(\"update_changelist\");"},{"Add":" let name = self.name();"},{"Add":" let mut remote = txn.open_or_create_remote(name).unwrap();"},{"Add":" let n = self"},{"Add":" .dichotomy_changelist(txn, &remote.borrow().remote)"},{"Add":" .await?;"},{"Add":" debug!(\"update changelist {:?}\", n);"},{"Add":" let v: Vec<_> = txn"},{"Add":" .iter_remote(&remote.borrow().remote, n)"},{"Add":" .filter_map(|(k, _)| if k >= n { Some(k) } else { None })"},{"Add":" .collect();"},{"Add":" for k in v {"},{"Add":" debug!(\"deleting {:?}\", k);"},{"Add":" txn.del_remote(&mut remote, k)?;"},{"Add":" }"},{"Add":" self.download_changelist(txn, &mut remote, n, path).await?;"},{"Add":" Ok(remote)"},{"Add":" }"},{"Add":""},{"Add":" async fn dichotomy_changelist("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" remote: &T::Remote,"},{"Add":" ) -> Result {"},{"Add":" let mut a = 0;"},{"Add":" let (mut b, (_, state)) = if let Some(last) = txn.last_remote(remote) {"},{"Add":" last"},{"Add":" } else {"},{"Add":" debug!(\"the local copy of the remote has no changes\");"},{"Add":" return Ok(0);"},{"Add":" };"},{"Add":" if let Some((_, s)) = self.get_state(Some(b)).await? {"},{"Add":" if s == state {"},{"Add":" // The local list is already up to date."},{"Add":" return Ok(b + 1);"},{"Add":" }"},{"Add":" }"},{"Add":" // Else, find the last state we have in common with the"},{"Add":" // remote, it might be older than the last known state (if"},{"Add":" // changes were unrecorded on the remote)."},{"Add":" while a < b {"},{"Add":" let mid = (a + b) / 2;"},{"Add":" let (mid, (_, state)) = txn.get_remote_state(remote, mid).unwrap();"},{"Add":" let remote_state = self.get_state(Some(mid)).await?;"},{"Add":" debug!(\"dichotomy {:?} {:?} {:?}\", mid, state, remote_state);"},{"Add":" if let Some((_, remote_state)) = remote_state {"},{"Add":" if remote_state == state {"},{"Add":" if a == mid {"},{"Add":" return Ok(a + 1);"},{"Add":" } else {"},{"Add":" a = mid;"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if b == mid {"},{"Add":" break;"},{"Add":" } else {"},{"Add":" b = mid"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(a)"},{"Add":" }"},{"Add":""},{"Add":" async fn get_state("},{"Add":" &mut self,"},{"Add":" mid: Option,"},{"Add":" ) -> Result, anyhow::Error> {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Local(ref mut l) => l.get_state(mid),"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.get_state(mid).await,"},{"Add":" RemoteRepo::Http(ref h) => {"},{"Add":" debug!(\"get_state {:?}\", h.url);"},{"Add":" let url = format!(\"{}/{}\", h.url, DOT_DIR);"},{"Add":" let q = if let Some(mid) = mid {"},{"Add":" ["},{"Add":" (\"state\", format!(\"{}\", mid)),"},{"Add":" (\"channel\", h.channel.clone()),"},{"Add":" ]"},{"Add":" } else {"},{"Add":" [(\"state\", String::new()), (\"channel\", h.channel.clone())]"},{"Add":" };"},{"Add":" let res = h.client.get(&url).query(&q).send().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" return Err((crate::Error::Http {"},{"Add":" status: res.status(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" let resp = res.bytes().await?;"},{"Add":" let resp = std::str::from_utf8(&resp)?;"},{"Add":" debug!(\"resp = {:?}\", resp);"},{"Add":" let mut s = resp.split(' ');"},{"Add":" if let (Some(n), Some(m)) = ("},{"Add":" s.next().and_then(|s| s.parse().ok()),"},{"Add":" s.next().and_then(|m| Merkle::from_base32(m.as_bytes())),"},{"Add":" ) {"},{"Add":" Ok(Some((n, m)))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub async fn archive("},{"Add":" &mut self,"},{"Add":" prefix: Option,"},{"Add":" state: Option<(Merkle, &[Hash])>,"},{"Add":" mut w: W,"},{"Add":" ) -> Result {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Local(ref mut l) => {"},{"Add":" use libpijul::pristine::TxnT;"},{"Add":" debug!(\"archiving local repo\");"},{"Add":" let changes = libpijul::changestore::filesystem::FileSystem::from_root(&l.root);"},{"Add":" let mut tarball = libpijul::output::Tarball::new(w, prefix);"},{"Add":" let conflicts = if let Some((state, extra)) = state {"},{"Add":" let mut txn = l.pristine.mut_txn_begin();"},{"Add":" let mut channel = txn.load_channel(&l.channel).unwrap();"},{"Add":" txn.archive_with_state(&changes, &mut channel, state, extra, &mut tarball)?"},{"Add":" } else {"},{"Add":" let txn = l.pristine.txn_begin()?;"},{"Add":" let channel = txn.load_channel(&l.channel).unwrap();"},{"Add":" txn.archive(&changes, &channel, &mut tarball)?"},{"Add":" };"},{"Add":" Ok(conflicts.len() as u64)"},{"Add":" }"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.archive(prefix, state, w).await,"},{"Add":" RemoteRepo::Http(ref h) => {"},{"Add":" let url = h.url.clone() + \"/\" + DOT_DIR;"},{"Add":" let res = h.client.get(&url).query(&[(\"channel\", &h.channel)]);"},{"Add":" let res = if let Some((ref state, ref extra)) = state {"},{"Add":" let mut q = vec![(\"archive\".to_string(), state.to_base32())];"},{"Add":" if let Some(pre) = prefix {"},{"Add":" q.push((\"outputPrefix\".to_string(), pre));"},{"Add":" }"},{"Add":" for e in extra.iter() {"},{"Add":" q.push((\"change\".to_string(), e.to_base32()))"},{"Add":" }"},{"Add":" res.query(&q)"},{"Add":" } else {"},{"Add":" res"},{"Add":" };"},{"Add":" let res = res.send().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" return Err((crate::Error::Http {"},{"Add":" status: res.status(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" use futures_util::StreamExt;"},{"Add":" let mut stream = res.bytes_stream();"},{"Add":" let mut conflicts = 0;"},{"Add":" let mut n = 0;"},{"Add":" while let Some(item) = stream.next().await {"},{"Add":" let item = item?;"},{"Add":" let mut off = 0;"},{"Add":" while n < 8 && off < item.len() {"},{"Add":" conflicts = (conflicts << 8) | (item[off] as u64);"},{"Add":" off += 1;"},{"Add":" n += 1"},{"Add":" }"},{"Add":" w.write_all(&item[off..])?;"},{"Add":" }"},{"Add":" Ok(conflicts as u64)"},{"Add":" }"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" async fn download_changelist("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" remote: &mut RemoteRef,"},{"Add":" from: u64,"},{"Add":" paths: &[String],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Local(ref mut l) => l.download_changelist(txn, remote, from, paths),"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.download_changelist(txn, remote, from, paths).await,"},{"Add":" RemoteRepo::Http(ref h) => {"},{"Add":" let url = h.url.clone() + \"/\" + DOT_DIR;"},{"Add":" let from_ = from.to_string();"},{"Add":" let mut query = vec![(\"changelist\", &from_), (\"channel\", &h.channel)];"},{"Add":" for p in paths.iter() {"},{"Add":" query.push((\"path\", p));"},{"Add":" }"},{"Add":" let res = h.client.get(&url).query(&query).send().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" return Err((crate::Error::Http {"},{"Add":" status: res.status(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" let resp = res.bytes().await?;"},{"Add":" if let Ok(data) = std::str::from_utf8(&resp) {"},{"Add":" for l in data.lines() {"},{"Add":" if !l.is_empty() {"},{"Add":" let (n, h, m) = parse_line(l)?;"},{"Add":" txn.put_remote(remote, n, (h, m))?;"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub async fn upload_changes("},{"Add":" &mut self,"},{"Add":" mut local: PathBuf,"},{"Add":" to_channel: Option<&str>,"},{"Add":" changes: &[Hash],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" match self {"},{"Add":" RemoteRepo::Local(ref mut l) => l.upload_changes(local, to_channel, changes),"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.upload_changes(local, to_channel, changes).await,"},{"Add":" RemoteRepo::Http(ref h) => {"},{"Add":" for c in changes {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut local, &c);"},{"Add":" let url = h.url.clone() + \"/\" + DOT_DIR;"},{"Add":" let change = std::fs::read(&local)?;"},{"Add":" let mut to_channel = if let Some(ch) = to_channel {"},{"Add":" vec![(\"to_channel\", ch)]"},{"Add":" } else {"},{"Add":" Vec::new()"},{"Add":" };"},{"Add":" let c = c.to_base32();"},{"Add":" to_channel.push((\"apply\", &c));"},{"Add":" debug!(\"url {:?} {:?}\", url, to_channel);"},{"Add":" h.client"},{"Add":" .post(&url)"},{"Add":" .query(&to_channel)"},{"Add":" .body(change)"},{"Add":" .send()"},{"Add":" .await?;"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" /// Start (and possibly complete) the download of a change."},{"Add":" pub async fn start_change_download("},{"Add":" &mut self,"},{"Add":" c: libpijul::pristine::Hash,"},{"Add":" path: &mut PathBuf,"},{"Add":" full: bool,"},{"Add":" ) -> Result {"},{"Add":" debug!(\"start_change_download\");"},{"Add":" libpijul::changestore::filesystem::push_filename(path, &c);"},{"Add":" if std::fs::metadata(&path).is_ok() && !full {"},{"Add":" debug!(\"metadata {:?} ok\", path);"},{"Add":" libpijul::changestore::filesystem::pop_filename(path);"},{"Add":" return Ok(false);"},{"Add":" }"},{"Add":" std::fs::create_dir_all(&path.parent().unwrap())?;"},{"Add":" match *self {"},{"Add":" RemoteRepo::Local(ref mut l) => l.start_change_download(c, path).await?,"},{"Add":" RemoteRepo::Ssh(ref mut s) => s.start_change_download(c, full).await?,"},{"Add":" RemoteRepo::Http(ref h) => {"},{"Add":" let mut f = std::fs::File::create(&path)?;"},{"Add":" let c32 = c.to_base32();"},{"Add":" let url = format!(\"{}/{}\", h.url, DOT_DIR);"},{"Add":" let mut res = h.client.get(&url).query(&[(\"change\", c32)]).send().await?;"},{"Add":" if !res.status().is_success() {"},{"Add":" return Err((crate::Error::Http {"},{"Add":" status: res.status(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" while let Some(chunk) = res.chunk().await? {"},{"Add":" f.write_all(&chunk)?;"},{"Add":" }"},{"Add":" }"},{"Add":" RemoteRepo::None => unreachable!(),"},{"Add":" }"},{"Add":" libpijul::changestore::filesystem::pop_filename(path);"},{"Add":" Ok(true)"},{"Add":" }"},{"Add":""},{"Add":" pub async fn wait_downloads("},{"Add":" &mut self,"},{"Add":" changes_dir: &Path,"},{"Add":" hashes: &[libpijul::pristine::Hash],"},{"Add":" send: &mut tokio::sync::mpsc::Sender,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" if hashes.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" if let RemoteRepo::Ssh(ref mut s) = *self {"},{"Add":" s.wait_downloads(changes_dir, hashes, send).await?"},{"Add":" } else {"},{"Add":" for h in hashes {"},{"Add":" send.send(*h).await?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn pull("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" to_download: Vec,"},{"Add":" do_apply: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let (mut send, mut recv) = tokio::sync::mpsc::channel(100);"},{"Add":""},{"Add":" let mut change_path_ = repo.changes_dir.clone();"},{"Add":" let to_download_ = to_download.clone();"},{"Add":" let mut self_ = std::mem::replace(self, RemoteRepo::None);"},{"Add":" let t = tokio::spawn(async move {"},{"Add":" let mut hashes = Vec::new();"},{"Add":" for h in to_download_.iter() {"},{"Add":" if self_"},{"Add":" .start_change_download(*h, &mut change_path_, false)"},{"Add":" .await?"},{"Add":" {"},{"Add":" hashes.push(*h);"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"hashes = {:?}\", hashes);"},{"Add":" self_"},{"Add":" .wait_downloads(&change_path_, &hashes, &mut send)"},{"Add":" .await?;"},{"Add":" Ok(self_)"},{"Add":" });"},{"Add":""},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" let mut change_path = repo.changes_dir.clone();"},{"Add":" for h in to_download.iter() {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut change_path, &h);"},{"Add":" debug!(\"change_path = {:?}\", change_path);"},{"Add":" while std::fs::metadata(&change_path).is_err() {"},{"Add":" debug!(\"waiting\");"},{"Add":" let r = recv.recv().await;"},{"Add":" debug!(\"r = {:?}\", r);"},{"Add":" if r.is_none() {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut change_path);"},{"Add":" if do_apply {"},{"Add":" println!(\"Applying {:?}\", h.to_base32());"},{"Add":" debug!(\"applying {:?}\", h);"},{"Add":" txn.apply_change_ws(&repo.changes, channel, *h, &mut ws)?;"},{"Add":" } else {"},{"Add":" debug!(\"not applying {:?}\", h)"},{"Add":" }"},{"Add":" }"},{"Add":" std::mem::drop(recv);"},{"Add":" debug!(\"waiting for spawned process\");"},{"Add":" let r: Result<_, anyhow::Error> = t.await?;"},{"Add":" debug!(\"done\");"},{"Add":" *self = r?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_tag("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" tag: &[Hash],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let (mut send_signal, mut recv_signal) = tokio::sync::mpsc::channel(100);"},{"Add":" let (mut send_hash, mut recv_hash) = tokio::sync::mpsc::channel(100);"},{"Add":""},{"Add":" let mut change_path_ = repo.changes_dir.clone();"},{"Add":" let mut self_ = std::mem::replace(self, RemoteRepo::None);"},{"Add":" let t = tokio::spawn(async move {"},{"Add":" let mut hashes = Vec::new();"},{"Add":" while let Some(hash) = recv_hash.recv().await {"},{"Add":" if self_"},{"Add":" .start_change_download(hash, &mut change_path_, false)"},{"Add":" .await?"},{"Add":" {"},{"Add":" hashes.push(hash);"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"hashes = {:?}\", hashes);"},{"Add":" self_"},{"Add":" .wait_downloads(&change_path_, &hashes, &mut send_signal)"},{"Add":" .await?;"},{"Add":" Ok(self_)"},{"Add":" });"},{"Add":""},{"Add":" for &h in tag.iter() {"},{"Add":" send_hash.send(h).await?;"},{"Add":" }"},{"Add":""},{"Add":" let mut change_path = repo.changes_dir.clone();"},{"Add":" let mut hashes = Vec::new();"},{"Add":" while let Some(hash) = recv_signal.recv().await {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut change_path, &hash);"},{"Add":" std::fs::create_dir_all(change_path.parent().unwrap())?;"},{"Add":" use libpijul::changestore::ChangeStore;"},{"Add":" hashes.push(hash);"},{"Add":" for dep in repo.changes.get_dependencies(&hash)? {"},{"Add":" let dep: libpijul::pristine::Hash = dep;"},{"Add":" send_hash.send(dep).await?;"},{"Add":" }"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut change_path);"},{"Add":" }"},{"Add":" std::mem::drop(recv_signal);"},{"Add":" std::mem::drop(send_hash);"},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" while let Some(hash) = hashes.pop() {"},{"Add":" txn.apply_change_ws(&repo.changes, channel, hash, &mut ws)?;"},{"Add":" }"},{"Add":" let r: Result<_, anyhow::Error> = t.await?;"},{"Add":" *self = r?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_state("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" state: Merkle,"},{"Add":" lazy: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.update_changelist(txn, &[]).await?;"},{"Add":" let name = self.name();"},{"Add":" let remote = txn.open_or_create_remote(name).unwrap();"},{"Add":" if let RemoteRepo::Ssh(ref mut s) = self {"},{"Add":" s.clone_channel(repo, txn, channel, lazy).await?;"},{"Add":" let mut to_unrecord = Vec::new();"},{"Add":" let mut found = false;"},{"Add":" for (n, (h, s)) in txn.iter_rev_remote(&remote.borrow().remote, None) {"},{"Add":" debug!(\"{:?} {:?} {:?}\", n, h, s);"},{"Add":" if s == state {"},{"Add":" found = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" to_unrecord.push(h);"},{"Add":" }"},{"Add":" if !found {"},{"Add":" return Err((Error::StateNotFound { state }).into());"},{"Add":" }"},{"Add":" self.pull(repo, txn, channel, to_unrecord.clone(), false)"},{"Add":" .await?;"},{"Add":" for unrec in to_unrecord.iter() {"},{"Add":" txn.unrecord(&repo.changes, channel, unrec)?;"},{"Add":" }"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":""},{"Add":" let mut to_pull = Vec::new();"},{"Add":" let mut found = false;"},{"Add":" for (n, (h, s)) in txn.iter_remote(&remote.borrow().remote, 0) {"},{"Add":" debug!(\"{:?} {:?} {:?}\", n, h, s);"},{"Add":" to_pull.push(h);"},{"Add":" if s == state {"},{"Add":" found = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" if !found {"},{"Add":" return Err((Error::StateNotFound { state }).into());"},{"Add":" }"},{"Add":" self.pull(repo, txn, channel, to_pull, true).await?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn complete_changes("},{"Add":" &mut self,"},{"Add":" repo: &crate::repository::Repository,"},{"Add":" txn: &T,"},{"Add":" local_channel: &mut ChannelRef,"},{"Add":" changes: &[Hash],"},{"Add":" full: bool,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" use libpijul::changestore::ChangeStore;"},{"Add":" let (mut send_hash, mut recv_hash) = tokio::sync::mpsc::channel(100);"},{"Add":" let (mut send_sig, mut recv_sig) = tokio::sync::mpsc::channel(100);"},{"Add":" let mut self_ = std::mem::replace(self, RemoteRepo::None);"},{"Add":" let mut changes_dir = repo.changes_dir.clone();"},{"Add":" let t = tokio::spawn(async move {"},{"Add":" let mut hashes = Vec::new();"},{"Add":" while let Some(h) = recv_hash.recv().await {"},{"Add":" debug!(\"downloading full patch: {:?}\", h);"},{"Add":" if self_"},{"Add":" .start_change_download(h, &mut changes_dir, true)"},{"Add":" .await?"},{"Add":" {"},{"Add":" debug!(\"push\");"},{"Add":" hashes.push(h);"},{"Add":" }"},{"Add":" debug!(\"done\");"},{"Add":" }"},{"Add":" debug!(\"waiting\");"},{"Add":" self_"},{"Add":" .wait_downloads(&changes_dir, &hashes, &mut send_sig)"},{"Add":" .await?;"},{"Add":" let result: Result<_, anyhow::Error> = Ok(self_);"},{"Add":" result"},{"Add":" });"},{"Add":""},{"Add":" for c in changes {"},{"Add":" if repo.changes.has_contents(*c, txn.get_internal(*c)) {"},{"Add":" debug!(\"has contents {:?}\", c);"},{"Add":" continue;"},{"Add":" }"},{"Add":" if full {"},{"Add":" debug!(\"sending send_hash\");"},{"Add":" send_hash.send(*c).await?;"},{"Add":" debug!(\"sent\");"},{"Add":" continue;"},{"Add":" }"},{"Add":" let change = if let Some(i) = txn.get_internal(*c) {"},{"Add":" i"},{"Add":" } else {"},{"Add":" continue;"},{"Add":" };"},{"Add":" // Check if at least one non-empty vertex from c is still alive."},{"Add":" let v = libpijul::pristine::Vertex {"},{"Add":" change,"},{"Add":" start: libpijul::pristine::ChangePosition(0),"},{"Add":" end: libpijul::pristine::ChangePosition(0),"},{"Add":" };"},{"Add":" let channel = local_channel.borrow();"},{"Add":" for (v_, e) in txn.iter_graph(&channel.graph, v, None) {"},{"Add":" if v_.change < change {"},{"Add":" continue;"},{"Add":" } else if v_.change > change {"},{"Add":" break;"},{"Add":" }"},{"Add":" if e.flag.contains(libpijul::pristine::EdgeFlags::PARENT)"},{"Add":" && !e.flag.contains(libpijul::pristine::EdgeFlags::DELETED)"},{"Add":" {"},{"Add":" // Alive!"},{"Add":" debug!(\"sending alive\");"},{"Add":" send_hash.send(*c).await?;"},{"Add":" debug!(\"sent\");"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"dropping send_hash\");"},{"Add":" std::mem::drop(send_hash);"},{"Add":" while recv_sig.recv().await.is_some() {}"},{"Add":" *self = t.await??;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn clone_channel("},{"Add":" &mut self,"},{"Add":" repo: &mut Repository,"},{"Add":" txn: &mut T,"},{"Add":" local_channel: &mut ChannelRef,"},{"Add":" lazy: bool,"},{"Add":" path: &[String],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" if path.is_empty() {"},{"Add":" match *self {"},{"Add":" RemoteRepo::Ssh(ref mut s) => {"},{"Add":" return s.clone_channel(repo, txn, local_channel, lazy).await"},{"Add":" }"},{"Add":" _ => {}"},{"Add":" }"},{"Add":" }"},{"Add":" let remote_changes = self.update_changelist(txn, path).await?;"},{"Add":" let mut pullable = Vec::new();"},{"Add":" for (_, (h, _)) in txn.iter_remote(&remote_changes.borrow().remote, 0) {"},{"Add":" pullable.push(h)"},{"Add":" }"},{"Add":" // let pullable = self.pullable(txn, local_channel, path).await?;"},{"Add":" self.pull(repo, txn, local_channel, pullable, true).await"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn parse_line(data: &str) -> Result<(u64, Hash, Merkle), anyhow::Error> {"},{"Add":" debug!(\"data = {:?}\", data);"},{"Add":" let mut it = data.split('.');"},{"Add":" let n = if let Some(n) = it.next().and_then(|n| n.parse().ok()) {"},{"Add":" n"},{"Add":" } else {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: data.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" debug!(\"n = {:?}\", n);"},{"Add":" let h = if let Some(h) = it.next().and_then(|h| Hash::from_base32(h.as_bytes())) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: data.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" let m = if let Some(m) = it.next().and_then(|m| {"},{"Add":" debug!(\"m = {:?}\", m);"},{"Add":" Merkle::from_base32(m.as_bytes())"},{"Add":" }) {"},{"Add":" m"},{"Add":" } else {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: data.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" debug!(\"m = {:?}\", m);"},{"Add":" if it.next().is_some() {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: data.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" Ok((n, h, m))"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"local.rs","metadata":420},"context":[{"change":0,"pos":25370}],"contents":[{"Add":"use super::RemoteRef;"},{"Add":"use libpijul::pristine::{Base32, Hash, Merkle, MutTxnT, TxnT};"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::path::{Path, PathBuf};"},{"Add":""},{"Add":"pub struct Local {"},{"Add":" pub channel: String,"},{"Add":" pub root: std::path::PathBuf,"},{"Add":" pub changes_dir: std::path::PathBuf,"},{"Add":" pub pristine: libpijul::pristine::sanakirja::Pristine,"},{"Add":" pub name: String,"},{"Add":"}"},{"Add":""},{"Add":"impl Local {"},{"Add":" pub fn get_state(&mut self, mid: Option) -> Result, anyhow::Error> {"},{"Add":" let txn = self.pristine.txn_begin()?;"},{"Add":" let channel = txn.load_channel(&self.channel).unwrap();"},{"Add":" if let Some(mid) = mid {"},{"Add":" Ok(txn.get_changes(&channel, mid).map(|(_, m)| (mid, m)))"},{"Add":" } else {"},{"Add":" Ok(txn"},{"Add":" .reverse_log(&channel.borrow(), None)"},{"Add":" .next()"},{"Add":" .map(|(n, (_, m))| (n, m)))"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn download_changelist("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" remote: &mut RemoteRef,"},{"Add":" from: u64,"},{"Add":" paths: &[String],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let store = libpijul::changestore::filesystem::FileSystem::from_root(&self.root);"},{"Add":" let remote_txn = self.pristine.txn_begin()?;"},{"Add":" let remote_channel = if let Some(channel) = remote_txn.load_channel(&self.channel) {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" debug!(\"no remote channel named {:?}\", self.channel);"},{"Add":" return Ok(());"},{"Add":" };"},{"Add":" let mut paths_ = Vec::new();"},{"Add":" for s in paths {"},{"Add":" if let Ok((p, _ambiguous)) = remote_txn.follow_oldest_path(&store, &remote_channel, s) {"},{"Add":" paths_.push(p)"},{"Add":" }"},{"Add":" }"},{"Add":" for (n, (h, m)) in remote_txn.log(&remote_channel.borrow(), from) {"},{"Add":" if n >= from {"},{"Add":" debug!("},{"Add":" \"downloading changelist item {:?} {:?} {:?}\","},{"Add":" n,"},{"Add":" h.to_base32(),"},{"Add":" m.to_base32()"},{"Add":" );"},{"Add":" let h_int = remote_txn.get_internal(h).unwrap();"},{"Add":" if paths_.is_empty()"},{"Add":" || paths_"},{"Add":" .iter()"},{"Add":" .any(|x| remote_txn.get_touched_files(*x, Some(h_int)).is_some())"},{"Add":" {"},{"Add":" txn.put_remote(remote, n, (h, m))?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn upload_changes("},{"Add":" &mut self,"},{"Add":" mut local: PathBuf,"},{"Add":" to_channel: Option<&str>,"},{"Add":" changes: &[Hash],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let store = libpijul::changestore::filesystem::FileSystem::from_root(&self.root);"},{"Add":" let mut txn = self.pristine.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(to_channel.unwrap_or(&self.channel))?;"},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" for c in changes {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut local, &c);"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);"},{"Add":" std::fs::create_dir_all(&self.changes_dir.parent().unwrap())?;"},{"Add":" debug!(\"hard link {:?} {:?}\", local, self.changes_dir);"},{"Add":" std::fs::hard_link(&local, &self.changes_dir)?;"},{"Add":" debug!(\"hard link done\");"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut local);"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);"},{"Add":" txn.apply_change_ws(&store, &mut channel, *c, &mut ws)?;"},{"Add":" }"},{"Add":" let mut repo = libpijul::working_copy::filesystem::FileSystem::from_root(&self.root);"},{"Add":" txn.output_repository_no_pending(&mut repo, &store, &mut channel, \"\", true)?;"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub async fn start_change_download("},{"Add":" &mut self,"},{"Add":" c: libpijul::pristine::Hash,"},{"Add":" path: &Path,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);"},{"Add":" debug!(\"hard link {:?} {:?}\", self.changes_dir, path);"},{"Add":" std::fs::hard_link(&self.changes_dir, path)?;"},{"Add":" debug!(\"hard link done\");"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);"},{"Add":" debug!(\"sent\");"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"main.rs","metadata":420},"context":[{"change":0,"pos":21414}],"contents":[{"Add":"#[macro_use]"},{"Add":"extern crate clap;"},{"Add":"#[macro_use]"},{"Add":"extern crate thiserror;"},{"Add":"#[macro_use]"},{"Add":"extern crate serde_derive;"},{"Add":"#[macro_use]"},{"Add":"extern crate log;"},{"Add":"#[macro_use]"},{"Add":"extern crate lazy_static;"},{"Add":""},{"Add":"use clap::Clap;"},{"Add":"use human_panic::setup_panic;"},{"Add":"mod commands;"},{"Add":"mod config;"},{"Add":"mod remote;"},{"Add":"mod repository;"},{"Add":"use commands::*;"},{"Add":"use std::io::Write;"},{"Add":""},{"Add":"const DEFAULT_CHANNEL: &'static str = \"main\";"},{"Add":"const PROTOCOL_VERSION: usize = 3;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"#[clap(version = crate_version!(), author = crate_authors!())]"},{"Add":"pub struct Opts {"},{"Add":" #[clap(subcommand)]"},{"Add":" pub subcmd: SubCommand,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub enum SubCommand {"},{"Add":" #[clap(name = \"init\")]"},{"Add":" Init(Init),"},{"Add":" #[clap(name = \"clone\")]"},{"Add":" Clone(Clone),"},{"Add":" #[clap(name = \"record\", alias = \"rec\")]"},{"Add":" Record(Record),"},{"Add":" #[clap(name = \"diff\")]"},{"Add":" Diff(Diff),"},{"Add":" #[clap(name = \"log\")]"},{"Add":" Log(Log),"},{"Add":" #[clap(name = \"push\")]"},{"Add":" Push(Push),"},{"Add":" #[clap(name = \"pull\")]"},{"Add":" Pull(Pull),"},{"Add":" #[clap(name = \"change\")]"},{"Add":" Change(Change),"},{"Add":" #[clap(name = \"channel\")]"},{"Add":" Channel(Channel),"},{"Add":" #[clap(name = \"protocol\", setting = clap::AppSettings::Hidden)]"},{"Add":" Protocol(Protocol),"},{"Add":" #[cfg(feature = \"git\")]"},{"Add":" #[clap(name = \"git\")]"},{"Add":" Git(Git),"},{"Add":" #[clap(name = \"mv\")]"},{"Add":" Mv(Mv),"},{"Add":" #[clap(name = \"ls\")]"},{"Add":" Ls(Ls),"},{"Add":" #[clap(name = \"add\")]"},{"Add":" Add(Add),"},{"Add":" #[clap(name = \"remove\")]"},{"Add":" Remove(Remove),"},{"Add":" #[clap(name = \"reset\")]"},{"Add":" Reset(Reset),"},{"Add":" #[cfg(debug_assertions)]"},{"Add":" #[clap(name = \"debug\")]"},{"Add":" Debug(Debug),"},{"Add":" #[clap(name = \"fork\")]"},{"Add":" Fork(Fork),"},{"Add":" #[clap(name = \"unrecord\", alias = \"unrec\", alias = \"un\")]"},{"Add":" Unrecord(Unrecord),"},{"Add":" #[clap(name = \"apply\")]"},{"Add":" Apply(Apply),"},{"Add":" #[clap(name = \"remote\")]"},{"Add":" Remote(Remote),"},{"Add":" #[clap(name = \"archive\")]"},{"Add":" Archive(Archive),"},{"Add":" #[clap(name = \"credit\")]"},{"Add":" Credit(Credit),"},{"Add":" #[clap(name = \"upgrade\", setting = clap::AppSettings::Hidden)]"},{"Add":" Upgrade(Upgrade),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(\"No Pijul repository found\")]"},{"Add":" NoRepoRoot,"},{"Add":" #[error(\"Cannot access working directory\")]"},{"Add":" CannotAccessWorkingDirectory,"},{"Add":" #[error(\"Already in a repository\")]"},{"Add":" AlreadyInARepo,"},{"Add":" #[error(\"No such channel: {}\", channel)]"},{"Add":" NoSuchChannel { channel: String },"},{"Add":" #[error(\"Protocol error. Is this the correct URL?\")]"},{"Add":" ProtocolError { line: Vec },"},{"Add":" #[error(\"Not authenticated\")]"},{"Add":" NotAuthenticated,"},{"Add":" #[error(\"No change message\")]"},{"Add":" NoChangeMessage,"},{"Add":" #[error(\"Incorrect remote: {}\", name)]"},{"Add":" IncorrectRemote { name: String },"},{"Add":" #[error(\"Unknown host key\")]"},{"Add":" UnknownHostKey,"},{"Add":" #[error(\"Cannot record a binary change interactively. Use -a\")]"},{"Add":" RecordBinaryChange,"},{"Add":" #[error(\"Remote not found: {:?}\", remote)]"},{"Add":" RemoteNotFound { remote: String },"},{"Add":" #[error(\"No global config directory\")]"},{"Add":" NoGlobalConfigDir,"},{"Add":" #[error(\"Could not parse global config\")]"},{"Add":" CouldNotParseGlobal,"},{"Add":" #[error(\"Cannot dry-reset multiple files\")]"},{"Add":" CannotDryReset,"},{"Add":" #[error(\"Remote error: {}\", msg)]"},{"Add":" Remote { msg: String },"},{"Add":" #[error(\"Remote exited with status {}\", status)]"},{"Add":" RemoteExit { status: u32 },"},{"Add":" #[error(\"Missing remote\")]"},{"Add":" MissingRemote,"},{"Add":" #[error(\"State not found in remote: {:?}\", state)]"},{"Add":" StateNotFound { state: libpijul::pristine::Merkle },"},{"Add":" #[error(\"Missing dependencies for change {:?}\", h)]"},{"Add":" MissingDep { h: libpijul::pristine::Hash },"},{"Add":" #[error(\"Ambiguous path: {:?}\", path)]"},{"Add":" AmbiguousPath { path: String },"},{"Add":" #[error(\"No prefixes given. Use `.` to record the current directory.\")]"},{"Add":" NoRecordPrefixes,"},{"Add":" #[error(\"HTTP error: {}\", status.as_str())]"},{"Add":" Http { status: reqwest::StatusCode },"},{"Add":" #[error(\"Could not parse configuration file at {:?}\", path)]"},{"Add":" CouldNotReadConfig { path: std::path::PathBuf },"},{"Add":" #[error(\"No current channel\")]"},{"Add":" NoCurrentChannel,"},{"Add":" #[error(\"Channel not found: {:?}\", channel)]"},{"Add":" ChannelNotFound { channel: String },"},{"Add":" #[error(\"Cannot reset, because there are unrecorded changes\")]"},{"Add":" UnrecordedChanges,"},{"Add":" #[error(\"Could not infer repository name\")]"},{"Add":" CouldNotInferRepositoryName { repo: String },"},{"Add":"}"},{"Add":""},{"Add":"#[tokio::main]"},{"Add":"async fn main() {"},{"Add":" if !cfg!(debug_assertions) {"},{"Add":" setup_panic!();"},{"Add":" }"},{"Add":" env_logger::init();"},{"Add":" let opts: Opts = Opts::parse();"},{"Add":" if let Err(e) = run(opts).await {"},{"Add":" writeln!(std::io::stderr(), \"Error: {}\", e).unwrap_or(());"},{"Add":" std::process::exit(1);"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"async fn run(opts: Opts) -> Result<(), anyhow::Error> {"},{"Add":" match opts.subcmd {"},{"Add":" SubCommand::Log(l) => l.run(),"},{"Add":" SubCommand::Init(init) => init.run(),"},{"Add":" SubCommand::Clone(clone) => clone.run().await,"},{"Add":" SubCommand::Record(record) => record.run().await,"},{"Add":" SubCommand::Diff(diff) => diff.run(),"},{"Add":" SubCommand::Push(push) => push.run().await,"},{"Add":" SubCommand::Pull(pull) => pull.run().await,"},{"Add":" SubCommand::Change(change) => change.run(),"},{"Add":" SubCommand::Channel(channel) => channel.run(),"},{"Add":" SubCommand::Protocol(protocol) => protocol.run(),"},{"Add":" #[cfg(feature = \"git\")]"},{"Add":" SubCommand::Git(git) => git.run(),"},{"Add":" SubCommand::Mv(mv) => mv.run(),"},{"Add":" SubCommand::Ls(ls) => ls.run(),"},{"Add":" SubCommand::Add(add) => add.run(),"},{"Add":" SubCommand::Remove(remove) => remove.run(),"},{"Add":" SubCommand::Reset(reset) => reset.run(),"},{"Add":" #[cfg(debug_assertions)]"},{"Add":" SubCommand::Debug(debug) => debug.run(),"},{"Add":" SubCommand::Fork(fork) => fork.run(),"},{"Add":" SubCommand::Unrecord(unrecord) => unrecord.run(),"},{"Add":" SubCommand::Apply(apply) => apply.run(),"},{"Add":" SubCommand::Remote(remote) => remote.run(),"},{"Add":" SubCommand::Archive(archive) => archive.run().await,"},{"Add":" SubCommand::Credit(credit) => credit.run(),"},{"Add":" SubCommand::Upgrade(upgrade) => upgrade.run(),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn current_dir() -> Result {"},{"Add":" std::env::current_dir().map_err(|_| Error::CannotAccessWorkingDirectory)"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"config.rs","metadata":420},"context":[{"change":0,"pos":21414}],"contents":[{"Add":"use std::collections::HashMap;"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize)]"},{"Add":"pub struct Global {"},{"Add":" pub author: libpijul::change::Author,"},{"Add":"}"},{"Add":""},{"Add":"const CONFIG_DIR: &'static str = \"pijul\";"},{"Add":""},{"Add":"impl Global {"},{"Add":" pub fn load() -> Result {"},{"Add":" if let Some(mut dir) = dirs_next::config_dir() {"},{"Add":" dir.push(CONFIG_DIR);"},{"Add":" dir.push(\"config.toml\");"},{"Add":" let s = std::fs::read(&dir);"},{"Add":" let s = match s {"},{"Add":" Ok(s) => s,"},{"Add":" Err(e) => {"},{"Add":" if let Some(mut dir) = dirs_next::home_dir() {"},{"Add":" dir.push(\".pijulconfig\");"},{"Add":" std::fs::read(&dir)?"},{"Add":" } else {"},{"Add":" return Err(e.into());"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" debug!(\"s = {:?}\", s);"},{"Add":" if let Ok(c) = toml::from_slice(&s) {"},{"Add":" Ok(c)"},{"Add":" } else {"},{"Add":" Err((crate::Error::CouldNotReadConfig { path: dir }).into())"},{"Add":" }"},{"Add":" } else {"},{"Add":" Err(crate::Error::NoGlobalConfigDir.into())"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize, Default)]"},{"Add":"pub struct Config {"},{"Add":" pub current_channel: Option,"},{"Add":" pub default_remote: Option,"},{"Add":" pub remotes: HashMap,"},{"Add":" pub hooks: Option,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize, Default)]"},{"Add":"pub struct Hooks {"},{"Add":" pub record: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Config {"},{"Add":" pub fn get_current_channel<'a>(&'a self, alt: Option<&'a String>) -> &'a str {"},{"Add":" if let Some(channel) = alt {"},{"Add":" channel.as_ref()"},{"Add":" } else if let Some(ref channel) = self.current_channel {"},{"Add":" channel.as_str()"},{"Add":" } else {"},{"Add":" crate::DEFAULT_CHANNEL"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize)]"},{"Add":"struct Remote_ {"},{"Add":" ssh: Option,"},{"Add":" local: Option,"},{"Add":" url: Option,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"pub enum Remote {"},{"Add":" Ssh(SshRemote),"},{"Add":" Local { local: String },"},{"Add":" Http { url: String },"},{"Add":" None,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Clone, Serialize, Deserialize)]"},{"Add":"pub struct SshRemote {"},{"Add":" pub addr: String,"},{"Add":"}"},{"Add":""},{"Add":"impl<'de> serde::Deserialize<'de> for Remote {"},{"Add":" fn deserialize(deserializer: D) -> Result"},{"Add":" where"},{"Add":" D: serde::de::Deserializer<'de>,"},{"Add":" {"},{"Add":" let r = Remote_::deserialize(deserializer)?;"},{"Add":" if let Some(ssh) = r.ssh {"},{"Add":" Ok(Remote::Ssh(ssh))"},{"Add":" } else if let Some(local) = r.local {"},{"Add":" Ok(Remote::Local { local })"},{"Add":" } else if let Some(url) = r.url {"},{"Add":" Ok(Remote::Http { url })"},{"Add":" } else {"},{"Add":" Ok(Remote::None)"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl serde::Serialize for Remote {"},{"Add":" fn serialize(&self, serializer: D) -> Result"},{"Add":" where"},{"Add":" D: serde::ser::Serializer,"},{"Add":" {"},{"Add":" let r = match *self {"},{"Add":" Remote::Ssh(ref ssh) => Remote_ {"},{"Add":" ssh: Some(ssh.clone()),"},{"Add":" local: None,"},{"Add":" url: None,"},{"Add":" },"},{"Add":" Remote::Local { ref local } => Remote_ {"},{"Add":" local: Some(local.to_string()),"},{"Add":" ssh: None,"},{"Add":" url: None,"},{"Add":" },"},{"Add":" Remote::Http { ref url } => Remote_ {"},{"Add":" local: None,"},{"Add":" ssh: None,"},{"Add":" url: Some(url.to_string()),"},{"Add":" },"},{"Add":" Remote::None => Remote_ {"},{"Add":" local: None,"},{"Add":" ssh: None,"},{"Add":" url: None,"},{"Add":" },"},{"Add":" };"},{"Add":" r.serialize(serializer)"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"commands","metadata":1005},"context":[{"change":0,"pos":21414}],"contents":[]}},{"FileAdd":{"meta":{"basename":"upgrade.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::changestore::ChangeStore;"},{"Add":"use libpijul::pristine::{Hash, MutTxnT, TxnT};"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::collections::{HashMap, HashSet};"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Upgrade {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Upgrade {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut channels = HashMap::new();"},{"Add":" {"},{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" let mut hashes = HashSet::new();"},{"Add":" for channel in txn.iter_channels(\"\") {"},{"Add":" let channel = channel.borrow();"},{"Add":" let name = channel.name();"},{"Add":" let e = channels.entry(name.to_string()).or_insert(Vec::new());"},{"Add":" hashes.clear();"},{"Add":" for (_, (h, _)) in txn.reverse_log(&channel, None) {"},{"Add":" if !hashes.insert(h) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" let path = repo.changes.filename(&h);"},{"Add":" let change = libpijul::change::v3::LocalChange3::deserialize("},{"Add":" path.to_str().unwrap(),"},{"Add":" Some(&h),"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" e.push((h, change))"},{"Add":" }"},{"Add":" }"},{"Add":" std::fs::rename(repo.path.join(\".pijul\"), repo.path.join(\".pijul.old\"))?;"},{"Add":" }"},{"Add":" let repo2 = Repository::init(self.repo_path)?;"},{"Add":" let mut txn2 = repo2.pristine.mut_txn_begin();"},{"Add":" let mut translations = HashMap::new();"},{"Add":" translations.insert(None, None);"},{"Add":" translations.insert(Some(Hash::None), Some(Hash::None));"},{"Add":" for (channel_name, mut changes) in channels {"},{"Add":" let mut channel = txn2.open_or_create_channel(&channel_name)?;"},{"Add":" while let Some((old_h, c)) = changes.pop() {"},{"Add":" let h = repo2.changes.save_change(&c.to_v4(&translations))?;"},{"Add":" translations.insert(Some(old_h), Some(h));"},{"Add":" txn2.apply_change(&repo2.changes, &mut channel, h)?;"},{"Add":" }"},{"Add":" }"},{"Add":" txn2.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"unrecord.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::pristine::{Base32, MutTxnT, TxnT};"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Unrecord {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap("},{"Add":" about = \"identifier of the change (unambiguous prefixes are accepted)\","},{"Add":" multiple = true"},{"Add":" )]"},{"Add":" change_id: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Unrecord {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" debug!(\"{:?}\", repo.config);"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut stderr = std::io::stderr();"},{"Add":" for c in self.change_id.iter() {"},{"Add":" let (hash, change_id) = txn.hash_from_prefix(c)?;"},{"Add":" if let Some(mut channel) = txn.load_channel(channel_name) {"},{"Add":" let mut can_unrecord = true;"},{"Add":" let channel_ = channel.borrow();"},{"Add":" for (p, d) in txn.iter_revdep(change_id) {"},{"Add":" if p < change_id {"},{"Add":" continue;"},{"Add":" } else if p > change_id {"},{"Add":" break;"},{"Add":" }"},{"Add":" if txn.get_changeset(&channel_.changes, d, None).is_some() {"},{"Add":" if can_unrecord {"},{"Add":" writeln!(stderr, \"Cannot unrecord change {}, because the following changes depend on it:\", c)?"},{"Add":" }"},{"Add":" can_unrecord = false;"},{"Add":" writeln!(stderr, \" {}\", txn.get_external(d).unwrap().to_base32())?"},{"Add":" }"},{"Add":" }"},{"Add":" std::mem::drop(channel_);"},{"Add":" if can_unrecord {"},{"Add":" txn.unrecord(&repo.changes, &mut channel, &hash)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"reset.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use libpijul::pristine::MutTxnT;"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Reset {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"dry-run\")]"},{"Add":" dry_run: bool,"},{"Add":" #[clap(long = \"change\")]"},{"Add":" change: Option,"},{"Add":" files: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Reset {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let has_repo_path = self.repo_path.is_some();"},{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" use libpijul::pristine::TxnT;"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name) {"},{"Add":" channel"},{"Add":" } else if self.change.is_some() {"},{"Add":" txn.open_or_create_channel(&channel_name)?"},{"Add":" } else {"},{"Add":" return Err((Error::NoSuchChannel {"},{"Add":" channel: channel_name.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" if self.dry_run {"},{"Add":" if self.files.len() > 1 {"},{"Add":" return Err(Error::CannotDryReset.into());"},{"Add":" }"},{"Add":" let (pos, _ambiguous) = if has_repo_path {"},{"Add":" let root = std::fs::canonicalize(repo.path.join(&self.files[0]))?;"},{"Add":" let path = root.strip_prefix(&repo.path)?.to_str().unwrap();"},{"Add":" txn.follow_oldest_path(&repo.changes, &channel, &path)?"},{"Add":" } else {"},{"Add":" let path = self.files[0].to_str().unwrap();"},{"Add":" txn.follow_oldest_path(&repo.changes, &channel, &path)?"},{"Add":" };"},{"Add":" txn.output_file("},{"Add":" &repo.changes,"},{"Add":" &channel,"},{"Add":" pos,"},{"Add":" &mut libpijul::vertex_buffer::Writer::new(std::io::stdout()),"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" let current_channel = repo.config.get_current_channel(None);"},{"Add":" if self.channel.is_some()"},{"Add":" && self.channel.as_ref().map(|x| x.as_str()) != Some(current_channel)"},{"Add":" {"},{"Add":" if let Some(mut channel) = txn.load_channel(current_channel) {"},{"Add":" let mut state = libpijul::RecordBuilder::new();"},{"Add":" txn.record("},{"Add":" &mut state,"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" &mut channel,"},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" let rec = state.finish();"},{"Add":" debug!(\"actions = {:?}\", rec.actions);"},{"Add":" if !rec.actions.is_empty() {"},{"Add":" return Err(Error::UnrecordedChanges.into());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if self.channel.is_some() {"},{"Add":" repo.config.current_channel = self.channel;"},{"Add":" repo.save_config()?;"},{"Add":" }"},{"Add":""},{"Add":" if let Some(ch) = self.change {"},{"Add":" let (hash, _) = txn.hash_from_prefix(&ch)?;"},{"Add":" txn.apply_change_rec(&repo.changes, &mut channel, hash)?"},{"Add":" }"},{"Add":" if self.files.is_empty() {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" for root in self.files.iter() {"},{"Add":" let root = std::fs::canonicalize(&root)?;"},{"Add":" let path = root.strip_prefix(&repo.path)?.to_str().unwrap();"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" &path,"},{"Add":" true,"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit()?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"record.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use crate::Error;"},{"Add":"use chrono::Utc;"},{"Add":"use libpijul::change::*;"},{"Add":"use libpijul::changestore::*;"},{"Add":"use libpijul::pristine::{Base32, ChannelRef, MutTxnT, TxnT};"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::collections::HashMap;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::{Path, PathBuf};"},{"Add":"use thrussh_keys::PublicKeyBase64;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Record {"},{"Add":" #[clap(short = 'a', long = \"all\")]"},{"Add":" pub all: bool,"},{"Add":" #[clap(short = 'm', long = \"message\")]"},{"Add":" pub message: Option,"},{"Add":" #[clap(long = \"author\")]"},{"Add":" pub author: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" pub channel: Option,"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" pub repo_path: Option,"},{"Add":" #[clap(long = \"timestamp\")]"},{"Add":" pub timestamp: Option,"},{"Add":" #[clap(short = 'S')]"},{"Add":" pub sign: bool,"},{"Add":" #[clap(long = \"stdin\")]"},{"Add":" pub stdin: bool,"},{"Add":" #[clap(long = \"tag\")]"},{"Add":" pub tag: bool,"},{"Add":" #[clap(long = \"amend\")]"},{"Add":" pub amend: Option,"},{"Add":" pub prefixes: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Record {"},{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" let mut stderr = std::io::stderr();"},{"Add":""},{"Add":" if let Some(ref hooks) = repo.config.hooks {"},{"Add":" for h in hooks.record.iter() {"},{"Add":" let mut proc = std::process::Command::new(\"bash\")"},{"Add":" .current_dir(&repo.path)"},{"Add":" .args(&[\"-c\", &h])"},{"Add":" .spawn()?;"},{"Add":" let status = proc.wait()?;"},{"Add":" if !status.success() {"},{"Add":" writeln!(stderr, \"Hook {:?} exited with code {:?}\", h, status)?;"},{"Add":" std::process::exit(status.code().unwrap_or(1))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut channel ="},{"Add":" txn.open_or_create_channel(repo.config.get_current_channel(self.channel.as_ref()))?;"},{"Add":" let sign = self.sign;"},{"Add":""},{"Add":" let header = if let Some(ref amend) = self.amend {"},{"Add":" let (h, _) = txn.hash_from_prefix(amend)?;"},{"Add":" let header = repo.changes.get_header(&h)?;"},{"Add":" txn.unrecord(&repo.changes, &mut channel, &h)?;"},{"Add":" header"},{"Add":" } else {"},{"Add":" self.header()"},{"Add":" };"},{"Add":" let result = self.record("},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &repo.path,"},{"Add":" header,"},{"Add":" )?;"},{"Add":" if let Some((mut change, updates, hash)) = result {"},{"Add":" let hash = hash.unwrap();"},{"Add":" if sign {"},{"Add":" let mut key_path = dirs_next::home_dir().unwrap().join(\".ssh\");"},{"Add":" if let Some((pk, signature)) = sign_hash(&mut key_path, hash).await? {"},{"Add":" let sig = toml::Value::try_from(vec![Signature {"},{"Add":" public_key: pk,"},{"Add":" timestamp: change.header.timestamp,"},{"Add":" signature: signature,"},{"Add":" }])?;"},{"Add":" let mut toml = toml::map::Map::new();"},{"Add":" toml.insert(\"signatures\".to_string(), sig);"},{"Add":" change.unhashed = Some(toml.into());"},{"Add":" let hash2 = repo.changes.save_change(&change).unwrap();"},{"Add":" assert_eq!(hash2, hash);"},{"Add":" }"},{"Add":" }"},{"Add":" txn.apply_local_change(&mut channel, &change, hash, &updates)?;"},{"Add":" writeln!(stdout, \"Hash: {}\", hash.to_base32())?;"},{"Add":" txn.commit()?;"},{"Add":" } else {"},{"Add":" writeln!(stderr, \"Nothing to record\")?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn header(&self) -> ChangeHeader {"},{"Add":" let authors = if let Some(ref a) = self.author {"},{"Add":" vec![libpijul::change::Author {"},{"Add":" name: a.clone(),"},{"Add":" full_name: None,"},{"Add":" email: None,"},{"Add":" }]"},{"Add":" } else if let Ok(global) = crate::config::Global::load() {"},{"Add":" vec![global.author]"},{"Add":" } else {"},{"Add":" Vec::new()"},{"Add":" };"},{"Add":" ChangeHeader {"},{"Add":" message: self.message.clone().unwrap_or(String::new()),"},{"Add":" authors,"},{"Add":" description: None,"},{"Add":" timestamp: if let Some(t) = self.timestamp {"},{"Add":" chrono::DateTime::from_utc(chrono::NaiveDateTime::from_timestamp(t, 0), chrono::Utc)"},{"Add":" } else {"},{"Add":" Utc::now()"},{"Add":" },"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn fill_relative_prefixes(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" let cwd = std::env::current_dir()?;"},{"Add":" for p in self.prefixes.iter_mut() {"},{"Add":" if p.is_relative() {"},{"Add":" *p = cwd.join(&p);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn record("},{"Add":" mut self,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" working_copy: &mut libpijul::working_copy::FileSystem,"},{"Add":" changes: &C,"},{"Add":" repo_path: &Path,"},{"Add":" header: ChangeHeader,"},{"Add":" ) -> Result<"},{"Add":" Option<("},{"Add":" Change,"},{"Add":" HashMap,"},{"Add":" Option,"},{"Add":" )>,"},{"Add":" anyhow::Error,"},{"Add":" > {"},{"Add":" let mut state = libpijul::RecordBuilder::new();"},{"Add":" if self.prefixes.is_empty() {"},{"Add":" txn.record("},{"Add":" &mut state,"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" channel,"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" \"\","},{"Add":" )?"},{"Add":" } else {"},{"Add":" self.fill_relative_prefixes()?;"},{"Add":" working_copy.record_prefixes("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" changes,"},{"Add":" &mut state,"},{"Add":" repo_path,"},{"Add":" &self.prefixes,"},{"Add":" )?;"},{"Add":" }"},{"Add":" let mut rec = state.finish();"},{"Add":" if rec.actions.is_empty() {"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" let actions = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(txn))"},{"Add":" .collect();"},{"Add":" let change ="},{"Add":" LocalChange::make_change(txn, channel, actions, rec.contents, header, Vec::new());"},{"Add":""},{"Add":" let file_name = |local: &Local, _| -> String { format!(\"{}:{}\", local.path, local.line) };"},{"Add":" debug!(\"has_binary = {:?}\", rec.has_binary_files);"},{"Add":" let mut change = if self.all {"},{"Add":" change"},{"Add":" } else if rec.has_binary_files {"},{"Add":" return Err(Error::RecordBinaryChange.into());"},{"Add":" } else {"},{"Add":" let mut o = Vec::new();"},{"Add":" change.write(changes, None, file_name, true, &mut o)?;"},{"Add":""},{"Add":" let mut with_errors: Option> = None;"},{"Add":" let change = loop {"},{"Add":" let mut bytes = if let Some(ref o) = with_errors {"},{"Add":" edit::edit_bytes(&o[..])?"},{"Add":" } else {"},{"Add":" edit::edit_bytes(&o[..])?"},{"Add":" };"},{"Add":" if bytes.iter().all(|c| (*c as char).is_whitespace()) {"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" let mut change = std::io::BufReader::new(std::io::Cursor::new(&bytes));"},{"Add":" if let Ok(change) ="},{"Add":" Change::read_and_deps(&mut change, &mut rec.updatables, txn, channel)"},{"Add":" {"},{"Add":" break change;"},{"Add":" }"},{"Add":""},{"Add":" let mut err = SYNTAX_ERROR.as_bytes().to_vec();"},{"Add":" err.append(&mut bytes);"},{"Add":" with_errors = Some(err)"},{"Add":" };"},{"Add":" if change.changes.is_empty() {"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" change"},{"Add":" };"},{"Add":""},{"Add":" if change.header.message.trim().is_empty() {"},{"Add":" return Err(Error::NoChangeMessage.into());"},{"Add":" }"},{"Add":" let (dependencies, extra_known) = if self.tag {"},{"Add":" full_dependencies(txn, channel)"},{"Add":" } else {"},{"Add":" dependencies(txn, channel, change.changes.iter())"},{"Add":" };"},{"Add":" change.dependencies = dependencies;"},{"Add":" change.extra_known = extra_known;"},{"Add":" debug!(\"saving change\");"},{"Add":" let hash = changes.save_change(&change).unwrap();"},{"Add":" debug!(\"saved\");"},{"Add":" Ok(Some((change, rec.updatables, Some(hash))))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize)]"},{"Add":"struct Signature {"},{"Add":" public_key: String,"},{"Add":" timestamp: chrono::DateTime,"},{"Add":" signature: String,"},{"Add":"}"},{"Add":""},{"Add":"async fn sign_hash("},{"Add":" key_path: &mut PathBuf,"},{"Add":" hash: libpijul::pristine::Hash,"},{"Add":") -> Result, anyhow::Error> {"},{"Add":" let to_sign = hash.to_bytes();"},{"Add":" match thrussh_keys::agent::client::AgentClient::connect_env().await {"},{"Add":" Ok(agent) => {"},{"Add":" let mut agent = Some(agent);"},{"Add":" for k in &[\"id_ed25519.pub\", \"id_rsa.pub\"] {"},{"Add":" key_path.push(k);"},{"Add":" if let Ok(key) = thrussh_keys::load_public_key(&key_path) {"},{"Add":" debug!(\"key\");"},{"Add":" if let Some(a) = agent.take() {"},{"Add":" debug!(\"authenticate future\");"},{"Add":" if let (_, Ok(sig)) = a.sign_request_base64(&key, &to_sign).await {"},{"Add":" key_path.pop();"},{"Add":" let key = key.public_key_base64();"},{"Add":" return Ok(Some((key, sig)));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" key_path.pop();"},{"Add":" }"},{"Add":" }"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" }"},{"Add":" }"},{"Add":" for k in &[\"id_ed25519\", \"id_rsa\"] {"},{"Add":" key_path.push(k);"},{"Add":" if let Some(k) = crate::remote::ssh::load_secret_key(&key_path, k) {"},{"Add":" key_path.pop();"},{"Add":" let pk = k.public_key_base64();"},{"Add":" return Ok(Some((pk, k.sign_detached(&to_sign)?.to_base64())));"},{"Add":" } else {"},{"Add":" key_path.pop();"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":"}"},{"Add":""},{"Add":"const SYNTAX_ERROR: &'static str = \"# Syntax errors, please try again."},{"Add":"# Alternatively, you may delete the entire file (including this"},{"Add":"# comment to abort)."},{"Add":"\";"}]}},{"FileAdd":{"meta":{"basename":"pushpull.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::changestore::ChangeStore;"},{"Add":"use libpijul::pristine::{MutTxnT, TxnT};"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use regex::Regex;"},{"Add":"use std::collections::HashSet;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Remote {"},{"Add":" #[clap(subcommand)]"},{"Add":" subcmd: Option,"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub enum SubRemote {"},{"Add":" #[clap(name = \"delete\")]"},{"Add":" Delete { remote: String },"},{"Add":" #[clap(name = \"list\")]"},{"Add":" List,"},{"Add":"}"},{"Add":""},{"Add":"impl Remote {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" debug!(\"{:?}\", repo.config);"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" match self.subcmd {"},{"Add":" None | Some(SubRemote::List) => {"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" for r in txn.iter_remotes(\"\") {"},{"Add":" writeln!(stdout, \" {}\", r.name())?;"},{"Add":" }"},{"Add":" }"},{"Add":" Some(SubRemote::Delete { remote }) => {"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" if !txn.drop_named_remote(&remote)? {"},{"Add":" writeln!(std::io::stderr(), \"Remote not found: {:?}\", remote)?"},{"Add":" } else {"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Push {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(short = 'a')]"},{"Add":" all: bool,"},{"Add":" #[clap(short = 'k', about = \"Do not check certificates\")]"},{"Add":" no_cert_check: bool,"},{"Add":""},{"Add":" #[clap(last = true)]"},{"Add":" changes: Vec,"},{"Add":" #[clap(long = \"path\")]"},{"Add":" path: Option,"},{"Add":""},{"Add":" to: Option,"},{"Add":" #[clap(long = \"to-channel\")]"},{"Add":" to_channel: Option,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Pull {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"all\", short = 'a')]"},{"Add":" all: bool,"},{"Add":" #[clap(short = 'k', about = \"Do not check certificates\")]"},{"Add":" no_cert_check: bool,"},{"Add":""},{"Add":" #[clap("},{"Add":" long = \"full\","},{"Add":" about = \"Download full changes, even when not necessary\""},{"Add":" )]"},{"Add":" full: bool, // This can't be symmetric with push"},{"Add":" #[clap("},{"Add":" last = true,"},{"Add":" about = \"Pull changes from the local repository, not necessarily from a channel\""},{"Add":" )]"},{"Add":" changes: Vec, // For local changes only, can't be symmetric."},{"Add":""},{"Add":" #[clap(long = \"path\")]"},{"Add":" path: Option,"},{"Add":""},{"Add":" from: Option,"},{"Add":" #[clap(long = \"from-channel\")]"},{"Add":" from_channel: Option,"},{"Add":"}"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref CHANNEL: Regex = Regex::new(r#\"([^:]*)(:(.*))?\"#).unwrap();"},{"Add":"}"},{"Add":""},{"Add":"impl Push {"},{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" debug!(\"{:?}\", repo.config);"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let remote_name = if let Some(ref rem) = self.to {"},{"Add":" rem"},{"Add":" } else if let Some(ref def) = repo.config.default_remote {"},{"Add":" def"},{"Add":" } else {"},{"Add":" return Err(crate::Error::MissingRemote.into());"},{"Add":" };"},{"Add":" let mut push_channel = None;"},{"Add":" let remote_channel = if let Some(ref c) = self.to_channel {"},{"Add":" let c = CHANNEL.captures(c).unwrap();"},{"Add":" push_channel = c.get(3).map(|x| x.as_str());"},{"Add":" let c = c.get(1).unwrap().as_str();"},{"Add":" if c.is_empty() {"},{"Add":" channel_name"},{"Add":" } else {"},{"Add":" c"},{"Add":" }"},{"Add":" } else {"},{"Add":" channel_name"},{"Add":" };"},{"Add":" debug!(\"remote_channel = {:?} {:?}\", remote_channel, push_channel);"},{"Add":" let mut remote = repo"},{"Add":" .remote(&remote_name, remote_channel, self.no_cert_check)"},{"Add":" .await?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut paths = if let Some(p) = self.path {"},{"Add":" vec![p.to_string()]"},{"Add":" } else {"},{"Add":" vec![]"},{"Add":" };"},{"Add":" let remote_changes = remote.update_changelist(&mut txn, &paths).await?;"},{"Add":" let channel = txn.open_or_create_channel(channel_name)?;"},{"Add":""},{"Add":" let path = if let Some(path) = paths.pop() {"},{"Add":" let (p, ambiguous) = txn.follow_oldest_path(&repo.changes, &channel, &path)?;"},{"Add":" if ambiguous {"},{"Add":" return Err((crate::Error::AmbiguousPath { path: path.clone() }).into());"},{"Add":" }"},{"Add":" Some(p)"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":""},{"Add":" let mut to_upload = Vec::new();"},{"Add":" for (_, (h, m)) in txn.reverse_log(&channel.borrow(), None) {"},{"Add":" if txn.remote_has_state(&remote_changes, m) {"},{"Add":" break;"},{"Add":" }"},{"Add":" let h_int = txn.get_internal(h).unwrap();"},{"Add":" if !txn.remote_has_change(&remote_changes, h) {"},{"Add":" if let Some(ref p) = path {"},{"Add":" if txn.get_touched_files(*p, Some(h_int)).is_some() {"},{"Add":" to_upload.push(h)"},{"Add":" }"},{"Add":" } else {"},{"Add":" to_upload.push(h)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if to_upload.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":""},{"Add":" to_upload.reverse();"},{"Add":" debug!(\"to_upload = {:?}\", to_upload);"},{"Add":" let to_upload = if !self.all {"},{"Add":" let o = make_changelist(&repo.changes, &to_upload)?;"},{"Add":" let u = parse_changelist(&edit::edit_bytes(&o[..])?);"},{"Add":" check_deps(&repo.changes, &to_upload, &u)?;"},{"Add":" u"},{"Add":" } else {"},{"Add":" to_upload"},{"Add":" };"},{"Add":" debug!(\"to_upload = {:?}\", to_upload);"},{"Add":" remote"},{"Add":" .upload_changes(repo.changes_dir.clone(), push_channel, &to_upload)"},{"Add":" .await?;"},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" remote.finish().await?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Pull {"},{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let mut channel = txn.open_or_create_channel(channel_name)?;"},{"Add":" debug!(\"{:?}\", repo.config);"},{"Add":" let remote_name = if let Some(ref rem) = self.from {"},{"Add":" rem"},{"Add":" } else if let Some(ref def) = repo.config.default_remote {"},{"Add":" def"},{"Add":" } else {"},{"Add":" return Err(crate::Error::MissingRemote.into());"},{"Add":" };"},{"Add":" let from_channel = if let Some(ref c) = self.from_channel {"},{"Add":" c"},{"Add":" } else {"},{"Add":" crate::DEFAULT_CHANNEL"},{"Add":" };"},{"Add":" let mut remote = repo"},{"Add":" .remote(&remote_name, from_channel, self.no_cert_check)"},{"Add":" .await?;"},{"Add":" debug!(\"downloading\");"},{"Add":""},{"Add":" let to_download = if self.changes.is_empty() {"},{"Add":" let paths = if let Some(p) = self.path {"},{"Add":" vec![p.to_string()]"},{"Add":" } else {"},{"Add":" vec![]"},{"Add":" };"},{"Add":" let remote_changes = remote.update_changelist(&mut txn, &paths).await?;"},{"Add":" debug!(\"changelist done\");"},{"Add":" let mut to_download = Vec::new();"},{"Add":" for (_, (h, m)) in txn.iter_remote(&remote_changes.borrow().remote, 0) {"},{"Add":" if txn.channel_has_state(&channel, m) {"},{"Add":" break;"},{"Add":" } else if txn.get_revchanges(&channel, h).is_none() {"},{"Add":" to_download.push(h)"},{"Add":" }"},{"Add":" }"},{"Add":" to_download.reverse();"},{"Add":" to_download"},{"Add":" } else {"},{"Add":" let r: Result, anyhow::Error> = self"},{"Add":" .changes"},{"Add":" .iter()"},{"Add":" .map(|h| Ok(txn.hash_from_prefix(h)?.0))"},{"Add":" .collect();"},{"Add":" r?"},{"Add":" };"},{"Add":" if to_download.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" debug!(\"recording\");"},{"Add":" let recorded = txn.record_all("},{"Add":" libpijul::Algorithm::default(),"},{"Add":" &mut channel,"},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" let hash = if recorded.actions.is_empty() {"},{"Add":" None"},{"Add":" } else {"},{"Add":" Some(txn.apply_recorded(&mut channel, recorded, &repo.changes)?)"},{"Add":" };"},{"Add":" remote"},{"Add":" .pull("},{"Add":" &mut repo,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" to_download.clone(),"},{"Add":" self.all,"},{"Add":" )"},{"Add":" .await?;"},{"Add":" if !self.all {"},{"Add":" let o = make_changelist(&repo.changes, &to_download)?;"},{"Add":" let d = parse_changelist(&edit::edit_bytes(&o[..])?);"},{"Add":" check_deps(&repo.changes, &to_download, &d)?;"},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" debug!(\"to_download = {:?}\", to_download);"},{"Add":" for h in d.iter() {"},{"Add":" txn.apply_change_rec_ws(&repo.changes, &mut channel, *h, &mut ws)?;"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"completing changes\");"},{"Add":" remote"},{"Add":" .complete_changes(&repo, &txn, &mut channel, &to_download, self.full)"},{"Add":" .await?;"},{"Add":" remote.finish().await?;"},{"Add":""},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" if let Some(h) = hash {"},{"Add":" txn.unrecord(&repo.changes, &mut channel, &h)?;"},{"Add":" repo.changes.del_change(&h)?;"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Make the \"changelist\", i.e. the list of patches, editable in a"},{"Add":"/// text editor."},{"Add":"fn make_changelist("},{"Add":" changes: &S,"},{"Add":" pullable: &[libpijul::pristine::Hash],"},{"Add":") -> Result, anyhow::Error> {"},{"Add":" use libpijul::pristine::Base32;"},{"Add":" let mut v = Vec::new();"},{"Add":" writeln!("},{"Add":" v,"},{"Add":" \"# Please select the changes to pull. The lines that contain just a"},{"Add":"# valid hash, and no other character (except possibly a newline), will"},{"Add":"# be pulled.\\n\""},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let mut first_p = true;"},{"Add":" for p in pullable {"},{"Add":" if !first_p {"},{"Add":" writeln!(v, \"\").unwrap();"},{"Add":" }"},{"Add":" first_p = false;"},{"Add":" writeln!(v, \"{}\\n\", p.to_base32()).unwrap();"},{"Add":" let change = changes.get_header(&p)?;"},{"Add":" write!(v, \" Author: [\").unwrap();"},{"Add":" let mut first = true;"},{"Add":" for a in change.authors.iter() {"},{"Add":" if !first {"},{"Add":" write!(v, \", \").unwrap();"},{"Add":" }"},{"Add":" first = false;"},{"Add":" write!(v, \"{}\", a).unwrap();"},{"Add":" }"},{"Add":" writeln!(v, \"]\").unwrap();"},{"Add":" writeln!(v, \" Date: {}\\n\", change.timestamp).unwrap();"},{"Add":" for l in change.message.lines() {"},{"Add":" writeln!(v, \" {}\", l).unwrap();"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(v)"},{"Add":"}"},{"Add":""},{"Add":"fn parse_changelist(o: &[u8]) -> Vec {"},{"Add":" use libpijul::pristine::Base32;"},{"Add":" if let Ok(o) = std::str::from_utf8(o) {"},{"Add":" o.lines()"},{"Add":" .filter_map(|l| libpijul::pristine::Hash::from_base32(l.as_bytes()))"},{"Add":" .collect()"},{"Add":" } else {"},{"Add":" Vec::new()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn check_deps("},{"Add":" c: &C,"},{"Add":" original: &[libpijul::pristine::Hash],"},{"Add":" now: &[libpijul::pristine::Hash],"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let original_: HashSet<_> = original.iter().collect();"},{"Add":" let now_: HashSet<_> = now.iter().collect();"},{"Add":" for n in now {"},{"Add":" // check that all of `now`'s deps are in now or not in original"},{"Add":" for d in c.get_dependencies(n)? {"},{"Add":" if original_.get(&d).is_some() && now_.get(&d).is_none() {"},{"Add":" return Err((crate::Error::MissingDep { h: *n }).into());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"protocol.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use byteorder::{BigEndian, WriteBytesExt};"},{"Add":"use libpijul::pristine::{Base32, ChannelRef, Hash, MutTxnT};"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use regex::Regex;"},{"Add":"use std::collections::HashMap;"},{"Add":"use std::io::BufWriter;"},{"Add":"use std::io::{BufRead, Read, Write};"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Protocol {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"version\")]"},{"Add":" version: usize,"},{"Add":"}"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref STATE: Regex = Regex::new(r#\"state\\s+(\\S+)(\\s+([0-9]+)?)\\s+\"#).unwrap();"},{"Add":" static ref CHANGELIST: Regex = Regex::new(r#\"changelist\\s+(\\S+)\\s+([0-9]+)(.*)\\s+\"#).unwrap();"},{"Add":" static ref CHANGELIST_PATHS: Regex = Regex::new(r#\"\"((\\\\\")|[^\"])+\"\"#).unwrap();"},{"Add":" static ref CHANGE: Regex = Regex::new(r#\"((change)|(partial))\\s+([^ ]*)\\s+\"#).unwrap();"},{"Add":" static ref APPLY: Regex = Regex::new(r#\"apply\\s+(\\S+)\\s+(S+)\\s+([0-9]+)\\s+\"#).unwrap();"},{"Add":" static ref CHANNEL: Regex = Regex::new(r#\"channel\\s+(\\S+)\\s+\"#).unwrap();"},{"Add":" static ref ARCHIVE: Regex ="},{"Add":" Regex::new(r#\"archive\\s+(\\S+)\\s*(( ([^:]+))*)( :(.*))?\\n\"#).unwrap();"},{"Add":"}"},{"Add":""},{"Add":"fn load_channel(txn: &T, name: &str) -> Result, Error> {"},{"Add":" if let Some(c) = txn.load_channel(name) {"},{"Add":" Ok(c)"},{"Add":" } else {"},{"Add":" Err((Error::NoSuchChannel {"},{"Add":" channel: name.to_string(),"},{"Add":" })"},{"Add":" .into())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"const PARTIAL_CHANGE_SIZE: u64 = 1 << 20;"},{"Add":""},{"Add":"impl Protocol {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" use libpijul::pristine::TxnT;"},{"Add":" let mut buf = String::new();"},{"Add":" let mut buf2 = vec![0; 4096 * 10];"},{"Add":" let s = std::io::stdin();"},{"Add":" let mut s = s.lock();"},{"Add":" let o = std::io::stdout();"},{"Add":" let o = o.lock();"},{"Add":" let mut applied = HashMap::new();"},{"Add":" let mut o = BufWriter::new(o);"},{"Add":" debug!(\"reading\");"},{"Add":" while s.read_line(&mut buf)? > 0 {"},{"Add":" debug!(\"{:?}\", buf);"},{"Add":" if let Some(cap) = STATE.captures(&buf) {"},{"Add":" let channel = load_channel(&txn, &cap[1])?;"},{"Add":" let init = if let Some(u) = cap.get(3) {"},{"Add":" u.as_str().parse().ok()"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" if let Some(pos) = init {"},{"Add":" for (n, (_, m)) in txn.log(&channel.borrow(), pos) {"},{"Add":" if n < pos {"},{"Add":" continue;"},{"Add":" } else if n > pos {"},{"Add":" writeln!(o, \"-\")?;"},{"Add":" break;"},{"Add":" } else {"},{"Add":" writeln!(o, \"{} {}\", n, m.to_base32())?;"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" if let Some((n, (_, m))) = txn.reverse_log(&channel.borrow(), None).next() {"},{"Add":" writeln!(o, \"{} {}\", n, m.to_base32())?"},{"Add":" } else {"},{"Add":" writeln!(o, \"-\")?;"},{"Add":" }"},{"Add":" }"},{"Add":" o.flush()?;"},{"Add":" } else if let Some(cap) = CHANGELIST.captures(&buf) {"},{"Add":" let channel = load_channel(&txn, &cap[1])?;"},{"Add":" let from: u64 = cap[2].parse().unwrap();"},{"Add":" let mut paths = Vec::new();"},{"Add":" for r in CHANGELIST_PATHS.captures_iter(&cap[3]) {"},{"Add":" let s: String = r[0].parse().unwrap();"},{"Add":" if let Ok((p, ambiguous)) = txn.follow_oldest_path(&repo.changes, &channel, &s)"},{"Add":" {"},{"Add":" if ambiguous {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: buf.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" paths.push(p)"},{"Add":" } else {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: buf.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" }"},{"Add":" for (n, (h, m)) in txn.log(&channel.borrow(), from) {"},{"Add":" let h_int = txn.get_internal(h).unwrap();"},{"Add":" if paths.is_empty()"},{"Add":" || paths"},{"Add":" .iter()"},{"Add":" .any(|x| txn.get_touched_files(*x, Some(h_int)).is_some())"},{"Add":" {"},{"Add":" writeln!(o, \"{}.{}.{}\", n, h.to_base32(), m.to_base32())?"},{"Add":" }"},{"Add":" }"},{"Add":" writeln!(o, \"\")?;"},{"Add":" o.flush()?;"},{"Add":" } else if let Some(cap) = CHANGE.captures(&buf) {"},{"Add":" let h_ = &cap[4];"},{"Add":" let h = if let Some(h) = Hash::from_base32(h_.as_bytes()) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: buf.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut repo.changes_dir, &h);"},{"Add":" debug!(\"repo = {:?}\", repo.changes_dir);"},{"Add":" let mut f = std::fs::File::open(&repo.changes_dir)?;"},{"Add":" let size = std::fs::metadata(&repo.changes_dir)?.len();"},{"Add":" let size = if &cap[1] == \"change\" || size <= PARTIAL_CHANGE_SIZE {"},{"Add":" size"},{"Add":" } else {"},{"Add":" libpijul::change::Change::size_no_contents(&mut f)?"},{"Add":" };"},{"Add":" o.write_u64::(size)?;"},{"Add":" let mut size = size as usize;"},{"Add":" while size > 0 {"},{"Add":" if size < buf2.len() {"},{"Add":" buf2.truncate(size as usize);"},{"Add":" }"},{"Add":" let n = f.read(&mut buf2[..])?;"},{"Add":" if n == 0 {"},{"Add":" break;"},{"Add":" }"},{"Add":" size -= n;"},{"Add":" o.write_all(&buf2[..n])?;"},{"Add":" }"},{"Add":" o.flush()?;"},{"Add":" libpijul::changestore::filesystem::pop_filename(&mut repo.changes_dir);"},{"Add":" } else if let Some(cap) = APPLY.captures(&buf) {"},{"Add":" let h = if let Some(h) = Hash::from_base32(cap[2].as_bytes()) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Err((Error::ProtocolError {"},{"Add":" line: buf.as_bytes().to_vec(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" let mut path = repo.changes_dir.clone();"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut path, &h);"},{"Add":" let size: usize = cap[3].parse().unwrap();"},{"Add":" buf2.resize(size, 0);"},{"Add":" s.read_exact(&mut buf2)?;"},{"Add":" std::fs::write(&path, &buf2)?;"},{"Add":" libpijul::change::Change::deserialize(&path.to_string_lossy(), Some(&h))?;"},{"Add":" let mut channel = load_channel(&txn, &cap[1])?;"},{"Add":" txn.apply_change_ws(&repo.changes, &mut channel, h, &mut ws)?;"},{"Add":" applied.insert(cap[4].to_string(), channel);"},{"Add":" } else if let Some(cap) = CHANNEL.captures(&buf) {"},{"Add":" let channel = load_channel(&txn, &cap[1])?;"},{"Add":" let channel = channel.borrow();"},{"Add":" for d in libpijul::pristine::channel_dump::dump_channel(&txn, channel) {"},{"Add":" o.write_all(&d)?;"},{"Add":" }"},{"Add":" o.flush()?;"},{"Add":" } else if let Some(cap) = ARCHIVE.captures(&buf) {"},{"Add":" let mut w = Vec::new();"},{"Add":" let mut tarball = libpijul::output::Tarball::new("},{"Add":" &mut w,"},{"Add":" cap.get(6).map(|x| x.as_str().to_string()),"},{"Add":" );"},{"Add":" let channel = load_channel(&txn, &cap[1])?;"},{"Add":" let conflicts = if let Some(caps) = cap.get(2) {"},{"Add":" debug!(\"caps = {:?}\", caps.as_str());"},{"Add":" let mut hashes = caps.as_str().split(' ').filter(|x| !x.is_empty());"},{"Add":" let state: libpijul::pristine::Merkle = hashes.next().unwrap().parse().unwrap();"},{"Add":" let extra: Vec ="},{"Add":" hashes.map(|x| x.parse().unwrap()).collect();"},{"Add":" debug!(\"state = {:?}, extra = {:?}\", state, extra);"},{"Add":" if txn.current_state(&channel.borrow()) == Some(state) && extra.is_empty() {"},{"Add":" txn.archive(&repo.changes, &channel, &mut tarball)?"},{"Add":" } else {"},{"Add":" use rand::Rng;"},{"Add":" let fork_name: String = rand::thread_rng()"},{"Add":" .sample_iter(&rand::distributions::Alphanumeric)"},{"Add":" .take(30)"},{"Add":" .collect();"},{"Add":" let mut fork = txn.fork(&channel, &fork_name)?;"},{"Add":" let conflicts = txn.archive_with_state("},{"Add":" &repo.changes,"},{"Add":" &mut fork,"},{"Add":" state,"},{"Add":" &extra,"},{"Add":" &mut tarball,"},{"Add":" )?;"},{"Add":" txn.drop_channel(&fork_name)?;"},{"Add":" conflicts"},{"Add":" }"},{"Add":" } else {"},{"Add":" txn.archive(&repo.changes, &channel, &mut tarball)?"},{"Add":" };"},{"Add":" std::mem::drop(tarball);"},{"Add":" let mut o = std::io::stdout();"},{"Add":" o.write_u64::(w.len() as u64)?;"},{"Add":" o.write_u64::(conflicts.len() as u64)?;"},{"Add":" o.write_all(&w)?;"},{"Add":" o.flush()?;"},{"Add":" } else {"},{"Add":" error!(\"unmatched\")"},{"Add":" }"},{"Add":" buf.clear();"},{"Add":" }"},{"Add":" let applied_nonempty = !applied.is_empty();"},{"Add":" for (_, mut channel) in applied {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" }"},{"Add":" if applied_nonempty {"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"mod.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"mod init;"},{"Add":"pub use init::Init;"},{"Add":""},{"Add":"mod clone;"},{"Add":"pub use clone::Clone;"},{"Add":""},{"Add":"mod pushpull;"},{"Add":"pub use pushpull::*;"},{"Add":""},{"Add":"mod log;"},{"Add":"pub use self::log::Log;"},{"Add":""},{"Add":"mod record;"},{"Add":"pub use record::Record;"},{"Add":""},{"Add":"mod diff;"},{"Add":"pub use diff::Diff;"},{"Add":""},{"Add":"mod change;"},{"Add":"pub use change::Change;"},{"Add":""},{"Add":"mod protocol;"},{"Add":"pub use protocol::Protocol;"},{"Add":""},{"Add":"#[cfg(feature = \"git\")]"},{"Add":"mod git;"},{"Add":"#[cfg(feature = \"git\")]"},{"Add":"pub use git::Git;"},{"Add":""},{"Add":"mod channel;"},{"Add":"pub use channel::*;"},{"Add":""},{"Add":"mod reset;"},{"Add":"pub use reset::*;"},{"Add":""},{"Add":"mod fork;"},{"Add":"pub use fork::*;"},{"Add":""},{"Add":"mod unrecord;"},{"Add":"pub use unrecord::*;"},{"Add":""},{"Add":"mod file_operations;"},{"Add":"pub use file_operations::*;"},{"Add":""},{"Add":"mod apply;"},{"Add":"pub use apply::*;"},{"Add":""},{"Add":"mod archive;"},{"Add":"pub use archive::*;"},{"Add":""},{"Add":"mod credit;"},{"Add":"pub use credit::*;"},{"Add":""},{"Add":"#[cfg(debug_assertions)]"},{"Add":"mod debug;"},{"Add":"#[cfg(debug_assertions)]"},{"Add":"pub use debug::*;"},{"Add":""},{"Add":"mod upgrade;"},{"Add":"pub use upgrade::*;"}]}},{"FileAdd":{"meta":{"basename":"log.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use libpijul::changestore::*;"},{"Add":"use libpijul::pristine::Base32;"},{"Add":"use libpijul::TxnTExt;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Log {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"hash-only\")]"},{"Add":" hash_only: bool,"},{"Add":" #[clap(long = \"state\")]"},{"Add":" states: bool,"},{"Add":" #[clap(long = \"description\")]"},{"Add":" descriptions: bool,"},{"Add":"}"},{"Add":""},{"Add":"impl Log {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" use libpijul::pristine::TxnT;"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let channel = if let Some(channel) = txn.load_channel(channel_name) {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" return Err((Error::NoSuchChannel {"},{"Add":" channel: channel_name.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" let changes = repo.changes;"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" if self.hash_only {"},{"Add":" for h in libpijul::change::full_dependencies(&txn, &channel).0 {"},{"Add":" writeln!(stdout, \"{}\", h.to_base32())?"},{"Add":" }"},{"Add":" } else {"},{"Add":" let states = self.states;"},{"Add":" for (_, (h, mrk)) in txn.reverse_log(&channel.borrow(), None) {"},{"Add":" let change = changes.get_change(&h)?;"},{"Add":" writeln!(stdout, \"Change {}\", h.to_base32())?;"},{"Add":" writeln!(stdout, \"Author: {:?}\", change.header.authors)?;"},{"Add":" writeln!(stdout, \"Date: {}\", change.header.timestamp)?;"},{"Add":" if states {"},{"Add":" writeln!(stdout, \"State: {}\", mrk.to_base32())?;"},{"Add":" }"},{"Add":" writeln!(stdout, \"\\n {}\\n\", change.header.message)?;"},{"Add":" if self.descriptions {"},{"Add":" if let Some(ref descr) = change.header.description {"},{"Add":" writeln!(stdout, \"\\n {}\\n\", descr)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"init.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use libpijul::pristine::MutTxnT;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Init {"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" path: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Init {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::init(self.path)?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let channel_name = self.channel.unwrap_or(crate::DEFAULT_CHANNEL.to_string());"},{"Add":" txn.open_or_create_channel(&channel_name)?;"},{"Add":" repo.config.current_channel = Some(channel_name);"},{"Add":" repo.save_config()?;"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"git.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use libpijul::pristine::*;"},{"Add":"use libpijul::*;"},{"Add":"use std::cell::RefCell;"},{"Add":"use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};"},{"Add":"use std::io::Write;"},{"Add":"use std::path::{Path, PathBuf};"},{"Add":"use std::rc::Rc;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Git {"},{"Add":" #[clap(long = \"stats\")]"},{"Add":" stats: Option,"},{"Add":" pub repo_path: Option,"},{"Add":" #[clap(default_value = \"0\")]"},{"Add":" check: usize,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(\"Pijul channel changed since last import. Please unrecord channel {} to state {}\", channel, state.to_base32())]"},{"Add":" MerkleChanged {"},{"Add":" channel: String,"},{"Add":" state: libpijul::pristine::Merkle,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"struct OpenRepo {"},{"Add":" repo: Repository,"},{"Add":" stats: Option,"},{"Add":" n: usize,"},{"Add":" check: usize,"},{"Add":" current_commit: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Git {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {"},{"Add":" repo"},{"Add":" } else {"},{"Add":" Repository::init(self.repo_path.clone())?"},{"Add":" };"},{"Add":" let git = git2::Repository::open(&repo.path)?;"},{"Add":" let head = git.head()?;"},{"Add":" info!(\"Loading history…\");"},{"Add":" let oid = head.target().unwrap();"},{"Add":" let mut path_git = repo.path.join(libpijul::DOT_DIR);"},{"Add":" path_git.push(\"git\");"},{"Add":" std::fs::create_dir_all(&path_git)?;"},{"Add":" let mut env_git = ::sanakirja::Env::new(&path_git, 1 << 15)?;"},{"Add":" let dag = Dag::dfs(&git, oid, &mut env_git)?;"},{"Add":""},{"Add":" trace!(target: \"dag\", \"{:?}\", dag);"},{"Add":" info!(\"Done\");"},{"Add":" let mut pristine = repo.path.join(DOT_DIR);"},{"Add":" pristine.push(PRISTINE_DIR);"},{"Add":" std::fs::create_dir_all(&pristine)?;"},{"Add":" let mut repo = OpenRepo {"},{"Add":" repo,"},{"Add":" stats: self.stats.and_then(|f| std::fs::File::create(f).ok()),"},{"Add":" n: 0,"},{"Add":" check: self.check,"},{"Add":" current_commit: None,"},{"Add":" };"},{"Add":" import(&git, &mut env_git, &mut repo, &dag)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"struct Dag {"},{"Add":" children: BTreeMap>,"},{"Add":" parents: BTreeMap>,"},{"Add":" root: Vec<(git2::Oid, Option)>,"},{"Add":"}"},{"Add":""},{"Add":"impl Dag {"},{"Add":" /// Load a Git repository in memory. The main reason this is"},{"Add":" /// needed is to compute the *backward* relations from a commit to"},{"Add":" /// its parents."},{"Add":" fn dfs("},{"Add":" git: &git2::Repository,"},{"Add":" oid: git2::Oid,"},{"Add":" env_git: &mut ::sanakirja::Env,"},{"Add":" ) -> Result {"},{"Add":" use ::sanakirja::Transaction;"},{"Add":" let mut stack = vec![git.find_commit(oid)?];"},{"Add":" let mut oids_set = BTreeSet::new();"},{"Add":" let mut dag = Dag {"},{"Add":" children: BTreeMap::new(),"},{"Add":" parents: BTreeMap::new(),"},{"Add":" root: Vec::new(),"},{"Add":" };"},{"Add":" oids_set.insert(oid.clone());"},{"Add":" let mut txn_git = ::sanakirja::Env::mut_txn_begin(env_git)?;"},{"Add":" let db: ::sanakirja::Db ="},{"Add":" if let Some(db) = txn_git.root(0) {"},{"Add":" db"},{"Add":" } else {"},{"Add":" txn_git.create_db()?"},{"Add":" };"},{"Add":" let mut state = HashMap::new();"},{"Add":" for (commit, merk) in txn_git.iter(&db, None) {"},{"Add":" state.insert(commit, merk);"},{"Add":" }"},{"Add":" debug!(\"state = {:?}\", state);"},{"Add":" while let Some(commit) = stack.pop() {"},{"Add":" if let Some(state) = state.get(&commit.id()) {"},{"Add":" dag.root.push((commit.id(), Some(*state)));"},{"Add":" continue;"},{"Add":" }"},{"Add":" let mut has_parents = false;"},{"Add":" for p in commit.parents() {"},{"Add":" trace!(\"parent {:?}\", p);"},{"Add":" dag.children"},{"Add":" .entry(p.id())"},{"Add":" .or_insert(Vec::new())"},{"Add":" .push(commit.id());"},{"Add":" dag.parents"},{"Add":" .entry(commit.id())"},{"Add":" .or_insert(Vec::new())"},{"Add":" .push(p.id());"},{"Add":" if oids_set.insert(p.id()) {"},{"Add":" stack.push(p);"},{"Add":" }"},{"Add":" has_parents = true"},{"Add":" }"},{"Add":" if !has_parents {"},{"Add":" dag.root.push((commit.id(), None))"},{"Add":" }"},{"Add":" }"},{"Add":" txn_git.set_root(0, db);"},{"Add":" ::sanakirja::Commit::commit(txn_git)?;"},{"Add":" Ok(dag)"},{"Add":" }"},{"Add":""},{"Add":" fn collect_dead_parents("},{"Add":" &self,"},{"Add":" oid: &git2::Oid,"},{"Add":" todo: &mut Todo,"},{"Add":" txn: &mut T,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" if let Some(parents) = self.parents.get(oid) {"},{"Add":" debug!(\"parents {:?}\", parents);"},{"Add":" for p in parents {"},{"Add":" let rc = todo.refs.get_mut(p).unwrap();"},{"Add":" *rc -= 1;"},{"Add":" if *rc == 0 {"},{"Add":" let p_name = format!(\"{}\", p);"},{"Add":" debug!(\"dropping channel {:?}\", p_name);"},{"Add":" txn.drop_channel(&p_name)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn insert_children_in_todo(&self, oid: &git2::Oid, todo: &mut Todo) {"},{"Add":" if let Some(c) = self.children.get(&oid) {"},{"Add":" for child in c {"},{"Add":" debug!(\"child = {:?}\", c);"},{"Add":" if todo.next_todo_set.insert(*child) {"},{"Add":" todo.next_todo.push(*child);"},{"Add":" }"},{"Add":" *todo.refs.entry(*oid).or_insert(0) += 1;"},{"Add":" }"},{"Add":" } else {"},{"Add":" debug!(\"no children\")"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"struct Todo {"},{"Add":" todo: Vec,"},{"Add":" todo_set: HashSet,"},{"Add":" next_todo: Vec,"},{"Add":" next_todo_set: HashSet,"},{"Add":" // For each key k, number of items in the union of todo and"},{"Add":" // next_todo that have k as a parent. Moreover, all commits that"},{"Add":" // were imported are in this map."},{"Add":" refs: HashMap,"},{"Add":"}"},{"Add":""},{"Add":"impl Todo {"},{"Add":" fn new() -> Self {"},{"Add":" Todo {"},{"Add":" todo: Vec::new(),"},{"Add":" todo_set: HashSet::new(),"},{"Add":" next_todo: Vec::new(),"},{"Add":" next_todo_set: HashSet::new(),"},{"Add":" refs: HashMap::new(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn swap_next(&mut self, todo: Vec) {"},{"Add":" self.todo = todo;"},{"Add":" std::mem::swap(&mut self.todo, &mut self.next_todo);"},{"Add":" self.todo_set.clear();"},{"Add":" std::mem::swap(&mut self.todo_set, &mut self.next_todo_set);"},{"Add":" }"},{"Add":""},{"Add":" fn insert_next(&mut self, oid: git2::Oid) {"},{"Add":" if self.next_todo_set.insert(oid) {"},{"Add":" self.next_todo.push(oid)"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn is_empty(&self) -> bool {"},{"Add":" self.todo.is_empty()"},{"Add":" }"},{"Add":""},{"Add":" fn all_processed(&self, parents: &[git2::Oid]) -> bool {"},{"Add":" parents.iter().all(|x| self.refs.contains_key(x))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Import the entire Git DAG into Pijul."},{"Add":"fn import("},{"Add":" git: &git2::Repository,"},{"Add":" env_git: &mut ::sanakirja::Env,"},{"Add":" repo: &mut OpenRepo,"},{"Add":" dag: &Dag,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let mut ws = libpijul::ApplyWorkspace::new();"},{"Add":" let mut todo = Todo::new();"},{"Add":""},{"Add":" let txn = repo.repo.pristine.mut_txn_begin();"},{"Add":" for &(oid, merkle) in dag.root.iter() {"},{"Add":" if let Some(merkle) = merkle {"},{"Add":" let oid_ = format!(\"{}\", oid);"},{"Add":" let channel = txn.load_channel(&oid_).unwrap();"},{"Add":" let (_, (_, merkle_)) = txn"},{"Add":" .changeid_rev_log(&channel.borrow(), None)"},{"Add":" .next()"},{"Add":" .unwrap();"},{"Add":" if merkle != merkle_ {"},{"Add":" return Err((Error::MerkleChanged {"},{"Add":" channel: oid_,"},{"Add":" state: merkle,"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" if let Some(children) = dag.children.get(&oid) {"},{"Add":" *todo.refs.entry(oid).or_insert(0) += children.len();"},{"Add":" for c in children.iter() {"},{"Add":" todo.insert_next(*c);"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" todo.insert_next(oid);"},{"Add":" if let Some(parents) = dag.parents.get(&oid) {"},{"Add":" for p in parents.iter() {"},{"Add":" *todo.refs.entry(*p).or_insert(0) += 1;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" std::mem::drop(txn);"},{"Add":" todo.swap_next(Vec::new());"},{"Add":""},{"Add":" while !todo.is_empty() {"},{"Add":" info!(\"TODO: {:?}\", todo);"},{"Add":" let mut todo_ = std::mem::replace(&mut todo.todo, Vec::new());"},{"Add":" {"},{"Add":" let mut txn = repo.repo.pristine.mut_txn_begin();"},{"Add":" let mut draining = todo_.drain(..);"},{"Add":" while let Some(oid) = draining.next() {"},{"Add":" let mut channel = if let Some(parents) = dag.parents.get(&oid) {"},{"Add":" // If we don't have all the parents, continue."},{"Add":" if !todo.all_processed(&parents) {"},{"Add":" todo.insert_next(oid);"},{"Add":" continue;"},{"Add":" }"},{"Add":" let first_parent = parents.iter().next().unwrap();"},{"Add":" let parent_name = format!(\"{}\", first_parent);"},{"Add":" let parent_channel = txn.load_channel(&parent_name).unwrap();"},{"Add":""},{"Add":" let name = format!(\"{}\", oid);"},{"Add":" let channel = txn.fork(&parent_channel, &name)?;"},{"Add":""},{"Add":" channel"},{"Add":" } else {"},{"Add":" // Create a new channel for this commit."},{"Add":" let name = format!(\"{}\", oid);"},{"Add":" let channel = txn.open_or_create_channel(&name)?;"},{"Add":" channel"},{"Add":" };"},{"Add":""},{"Add":" let mut stats = Stats::new(oid);"},{"Add":" import_commit_parents("},{"Add":" repo,"},{"Add":" dag,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" &oid,"},{"Add":" &mut ws,"},{"Add":" &mut stats,"},{"Add":" )?;"},{"Add":" let state = import_commit(git, repo, &mut txn, &mut channel, &oid, &mut stats)?;"},{"Add":" save_state(env_git, &oid, state)?;"},{"Add":" dag.collect_dead_parents(&oid, &mut todo, &mut txn)?;"},{"Add":" dag.insert_children_in_todo(&oid, &mut todo);"},{"Add":""},{"Add":" if let Some(ref mut f) = repo.stats {"},{"Add":" stats.write(repo.n, &repo.repo.path, f)?"},{"Add":" }"},{"Add":" // Just add the remaining commits to the todo list,"},{"Add":" // because we prefer to move each channel as far as"},{"Add":" // possible before switching channels."},{"Add":" while let Some(oid) = draining.next() {"},{"Add":" todo.insert_next(oid)"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":" todo.swap_next(todo_)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn save_state("},{"Add":" git: &mut ::sanakirja::Env,"},{"Add":" oid: &git2::Oid,"},{"Add":" state: libpijul::pristine::Merkle,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" use ::sanakirja::{Commit, Transaction};"},{"Add":" let mut txn = ::sanakirja::Env::mut_txn_begin(git)?;"},{"Add":" let mut db: ::sanakirja::Db ="},{"Add":" if let Some(db) = txn.root(0) {"},{"Add":" db"},{"Add":" } else {"},{"Add":" txn.create_db()?"},{"Add":" };"},{"Add":" txn.put(&mut rand::thread_rng(), &mut db, *oid, state)?;"},{"Add":" txn.set_root(0, db);"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn make_apply_plan("},{"Add":" repo: &OpenRepo,"},{"Add":" txn: &T,"},{"Add":" channel: &ChannelRef,"},{"Add":" dag: &Dag,"},{"Add":" oid: &git2::Oid,"},{"Add":") -> (bool, Vec<(libpijul::pristine::Hash, u64)>) {"},{"Add":" let mut to_apply = Vec::new();"},{"Add":" let mut to_apply_set = BTreeSet::new();"},{"Add":" let mut needs_output = false;"},{"Add":" if let Some(parents) = dag.parents.get(&oid) {"},{"Add":" for p in parents {"},{"Add":" // If one of the parents is not the repo's current commit,"},{"Add":" // then we're doing either a merge or a checkout of"},{"Add":" // another branch. If that is the case, we need to output"},{"Add":" // the entire repository to update the"},{"Add":" // tree/revtree/inodes/revinodes tables."},{"Add":" if let Some(current_commit) = repo.current_commit {"},{"Add":" if current_commit != *p {"},{"Add":" needs_output = true"},{"Add":" }"},{"Add":" }"},{"Add":" let p_name = format!(\"{}\", p);"},{"Add":" let p_channel = txn.load_channel(&p_name).unwrap();"},{"Add":" for (n, (h, _)) in txn.log(&p_channel.borrow(), 0) {"},{"Add":" if txn.has_change(&channel, h).is_none() {"},{"Add":" if to_apply_set.insert(h) {"},{"Add":" to_apply.push((h, n));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" needs_output = true"},{"Add":" }"},{"Add":""},{"Add":" // Since we're pulling from multiple channels, the change numbers"},{"Add":" // are not necessarily in order (especially since we've"},{"Add":" // de-duplicated using `to_apply_set`."},{"Add":""},{"Add":" to_apply.sort_by(|a, b| a.1.cmp(&b.1));"},{"Add":" (needs_output, to_apply)"},{"Add":"}"},{"Add":""},{"Add":"/// Apply the changes corresponding to a commit's parents to `channel`."},{"Add":"fn import_commit_parents("},{"Add":" repo: &mut OpenRepo,"},{"Add":" dag: &Dag,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" oid: &git2::Oid,"},{"Add":" ws: &mut libpijul::ApplyWorkspace,"},{"Add":" stats: &mut Stats,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" // Apply all the parent's logs to `channel`"},{"Add":" let (needs_output, to_apply) = make_apply_plan(repo, txn, channel, dag, oid);"},{"Add":" let parent_application_time = std::time::Instant::now();"},{"Add":" for h in to_apply.iter() {"},{"Add":" debug!(\"to_apply {:?}\", h)"},{"Add":" }"},{"Add":" for (h, _) in to_apply.iter() {"},{"Add":" info!(\"applying {:?} to {:?}\", h, channel.borrow().name());"},{"Add":" txn.apply_change_ws(&repo.repo.changes, channel, *h, ws)?;"},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 {"},{"Add":" check_alive(&repo.repo.changes, txn, channel, line!())?;"},{"Add":" }"},{"Add":" }"},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 {"},{"Add":" check_alive(&repo.repo.changes, txn, channel, line!())?;"},{"Add":" }"},{"Add":" stats.parent_application_time = if to_apply.is_empty() {"},{"Add":" std::time::Duration::from_secs(0)"},{"Add":" } else {"},{"Add":" parent_application_time.elapsed()"},{"Add":" };"},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 && !to_apply.is_empty() {"},{"Add":" txn.check_channel_log(&channel);"},{"Add":" }"},{"Add":" debug!("},{"Add":" \"last_recorded {:?}, name {:?}\","},{"Add":" repo.repo.config.current_channel,"},{"Add":" channel.borrow().name()"},{"Add":" );"},{"Add":" stats.output_time = if !to_apply.is_empty() || needs_output {"},{"Add":" debug!(\"outputting\");"},{"Add":" let output_time = std::time::Instant::now();"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.repo.working_copy,"},{"Add":" &repo.repo.changes,"},{"Add":" channel,"},{"Add":" \"\","},{"Add":" false,"},{"Add":" )?;"},{"Add":" let t = output_time.elapsed();"},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 {"},{"Add":" check_alive(&repo.repo.changes, txn, channel, line!())?;"},{"Add":" }"},{"Add":" t"},{"Add":" } else {"},{"Add":" std::time::Duration::from_secs(0)"},{"Add":" };"},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 {"},{"Add":" check_tree_inodes(txn, &channel.borrow());"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Reset to the Git commit specified by `child`, telling Pijul which"},{"Add":"/// files were moved in the reset."},{"Add":"fn git_reset<'a, T: TxnTExt + MutTxnTExt>("},{"Add":" git: &'a git2::Repository,"},{"Add":" repo: &mut OpenRepo,"},{"Add":""},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":""},{"Add":" child: &git2::Oid,"},{"Add":""},{"Add":" stats: &mut Stats,"},{"Add":") -> Result<(git2::Object<'a>, BTreeSet), anyhow::Error> {"},{"Add":" // Reset the Git branch."},{"Add":" debug!(\"resetting the git branch to {:?}\", child);"},{"Add":" let reset_time = std::time::Instant::now();"},{"Add":" let object = git.find_object(*child, None)?;"},{"Add":" let reset_was_useful = Rc::new(RefCell::new(false));"},{"Add":" let mut builder = git2::build::CheckoutBuilder::new();"},{"Add":" let repo_path = repo.repo.path.clone();"},{"Add":" let reset_was_useful_ = reset_was_useful.clone();"},{"Add":" builder"},{"Add":" .force()"},{"Add":" .remove_untracked(true)"},{"Add":" .remove_ignored(true)"},{"Add":" .progress(move |file, a, b| {"},{"Add":" debug!(\"Git progress: {:?} {:?} {:?}\", file, a, b);"},{"Add":" if let Some(file) = file {"},{"Add":" let file = repo_path.join(file);"},{"Add":" if let Ok(meta) = std::fs::metadata(&file) {"},{"Add":" if !meta.file_type().is_symlink() {"},{"Add":" *reset_was_useful_.borrow_mut() = true"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" });"},{"Add":" builder.notify(|notif, file, _, _, _| {"},{"Add":" info!(\"Git reset: {:?} {:?}\", notif, file);"},{"Add":" true"},{"Add":" });"},{"Add":" git.reset(&object, git2::ResetType::Hard, Some(&mut builder))?;"},{"Add":" repo.current_commit = Some(*child);"},{"Add":" stats.reset_time = reset_time.elapsed();"},{"Add":" debug!(\"reset done\");"},{"Add":""},{"Add":" let mut prefixes = BTreeSet::new();"},{"Add":" {"},{"Add":" let commit = object.as_commit().unwrap();"},{"Add":" let new_tree = commit.tree().unwrap();"},{"Add":""},{"Add":" debug!(\"inspecting commit\");"},{"Add":" let git_diff_time = std::time::Instant::now();"},{"Add":" for parent in commit.parents() {"},{"Add":" let old_tree = parent.tree().unwrap();"},{"Add":" let mut diff = git"},{"Add":" .diff_tree_to_tree(Some(&old_tree), Some(&new_tree), None)"},{"Add":" .unwrap();"},{"Add":" diff.find_similar(None).unwrap();"},{"Add":" let mut moves = Vec::new();"},{"Add":" for delta in diff.deltas() {"},{"Add":" let old_path = delta.old_file().path().unwrap();"},{"Add":" let new_path = delta.new_file().path().unwrap();"},{"Add":" match delta.status() {"},{"Add":" git2::Delta::Renamed => {"},{"Add":" info!("},{"Add":" \"mv {:?} {:?}\","},{"Add":" old_path.to_string_lossy(),"},{"Add":" new_path.to_string_lossy()"},{"Add":" );"},{"Add":" if let Ok((vertex, _)) = txn.follow_oldest_path("},{"Add":" &repo.repo.changes,"},{"Add":" &channel,"},{"Add":" &old_path.to_string_lossy(),"},{"Add":" ) {"},{"Add":" if let Some(inode) = txn.get_revinodes(vertex, None) {"},{"Add":" if let Some(old_path) = libpijul::fs::inode_filename(txn, inode) {"},{"Add":" debug!("},{"Add":" \"moving {:?} ({:?}) from {:?} to {:?}\","},{"Add":" inode, vertex, old_path, new_path"},{"Add":" );"},{"Add":" let mut tmp_path = new_path.to_path_buf();"},{"Add":" tmp_path.pop();"},{"Add":" use rand::Rng;"},{"Add":" let s: String = rand::thread_rng()"},{"Add":" .sample_iter(&rand::distributions::Alphanumeric)"},{"Add":" .take(30)"},{"Add":" .collect();"},{"Add":" tmp_path.push(&s);"},{"Add":" if let Err(e) ="},{"Add":" txn.move_file(&old_path, &tmp_path.to_string_lossy())"},{"Add":" {"},{"Add":" error!(\"{}\", e);"},{"Add":" } else {"},{"Add":" moves.push((tmp_path, new_path));"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" let new_path = new_path.to_path_buf();"},{"Add":" prefixes.insert(new_path);"},{"Add":" }"},{"Add":" git2::Delta::Deleted => {"},{"Add":" let old_path = old_path.to_path_buf();"},{"Add":" prefixes.insert(old_path);"},{"Add":" }"},{"Add":" _ => {"},{"Add":" if delta.new_file().mode() != git2::FileMode::Link {"},{"Add":" debug!(\"delta old = {:?} new = {:?}\", old_path, new_path);"},{"Add":" let old_path = old_path.to_path_buf();"},{"Add":" let new_path = new_path.to_path_buf();"},{"Add":" prefixes.insert(old_path);"},{"Add":" prefixes.insert(new_path);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"moves = {:?}\", moves);"},{"Add":" for (a, b) in moves.drain(..) {"},{"Add":" if let Err(e) = txn.move_file(&a.to_string_lossy(), &b.to_string_lossy()) {"},{"Add":" error!(\"{}\", e);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" stats.git_diff_time = git_diff_time.elapsed();"},{"Add":" debug!(\"done inspecting commit\");"},{"Add":" if prefixes.contains(std::path::Path::new(\"\")) {"},{"Add":" prefixes.clear();"},{"Add":" }"},{"Add":" info!(\"record prefixes {:?}\", prefixes);"},{"Add":" }"},{"Add":" Ok((object, prefixes))"},{"Add":"}"},{"Add":""},{"Add":"/// Reset to the Git commit specified as `child`, and record the"},{"Add":"/// corresponding change in Pijul."},{"Add":"fn import_commit("},{"Add":" git: &git2::Repository,"},{"Add":" repo: &mut OpenRepo,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" child: &git2::Oid,"},{"Add":" stats: &mut Stats,"},{"Add":") -> Result {"},{"Add":" let (object, prefixes) = git_reset(git, repo, txn, channel, child, stats)?;"},{"Add":" for p in prefixes.iter() {"},{"Add":" if let Ok(m) = std::fs::metadata(&p) {"},{"Add":" if m.is_dir() {"},{"Add":" txn.add_dir(p.to_str().unwrap()).unwrap_or(());"},{"Add":" } else {"},{"Add":" txn.add_file(p.to_str().unwrap()).unwrap_or(());"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" let commit = object.as_commit().unwrap();"},{"Add":" let signature = commit.author();"},{"Add":" // Record+Apply"},{"Add":" info!(\"recording on channel {:?}\", channel.borrow().name());"},{"Add":" let record_time = std::time::Instant::now();"},{"Add":""},{"Add":" let prefix_vec: Vec<_> = prefixes.into_iter().collect();"},{"Add":" let rec = record_apply("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut repo.repo.working_copy,"},{"Add":" &repo.repo.changes,"},{"Add":" &repo.repo.path,"},{"Add":" &prefix_vec,"},{"Add":" libpijul::change::ChangeHeader {"},{"Add":" message: commit.message().unwrap().to_string(),"},{"Add":" authors: vec![libpijul::change::Author {"},{"Add":" name: signature.name().unwrap().to_string(),"},{"Add":" email: signature.email().map(|e| e.to_string()),"},{"Add":" full_name: None,"},{"Add":" }],"},{"Add":" description: None,"},{"Add":" timestamp: chrono::DateTime::from_utc("},{"Add":" chrono::NaiveDateTime::from_timestamp(signature.when().seconds(), 0),"},{"Add":" chrono::Utc,"},{"Add":" ),"},{"Add":" },"},{"Add":" );"},{"Add":" let (n_actions, hash, state) = match rec {"},{"Add":" Ok(x) => x,"},{"Add":" Err(e) => match e.downcast() {"},{"Add":" Ok(libpijul::Error::ChangeAlreadyOnChannel { hash }) => {"},{"Add":" error!(\"change already on channel: {:?}\", hash);"},{"Add":" return Ok(txn.current_state(&channel.borrow()).unwrap());"},{"Add":" }"},{"Add":" Ok(e) => return Err(e.into()),"},{"Add":" Err(e) => return Err(e),"},{"Add":" },"},{"Add":" };"},{"Add":" stats.record_time = record_time.elapsed();"},{"Add":""},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 {"},{"Add":" check_alive(&repo.repo.changes, txn, channel, line!())?;"},{"Add":" }"},{"Add":""},{"Add":" stats.n_actions = n_actions;"},{"Add":" stats.hash = hash;"},{"Add":""},{"Add":" if let Some(ref mut cur) = repo.repo.config.current_channel {"},{"Add":" cur.clear();"},{"Add":" cur.push_str(channel.borrow().name());"},{"Add":" } else {"},{"Add":" repo.repo.config.current_channel = Some(channel.borrow().name().to_string())"},{"Add":" }"},{"Add":" repo.repo.save_config()?;"},{"Add":""},{"Add":" if repo.check > 0 && repo.n % repo.check == 0 {"},{"Add":" check_tree_inodes(txn, &channel.borrow());"},{"Add":" }"},{"Add":" repo.n += 1;"},{"Add":" if let Some(state) = state {"},{"Add":" Ok(state)"},{"Add":" } else {"},{"Add":" Ok(txn.current_state(&channel.borrow()).unwrap())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn record_apply("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" working_copy: &mut libpijul::working_copy::FileSystem,"},{"Add":" changes: &C,"},{"Add":" repo_path: &Path,"},{"Add":" prefixes: &[PathBuf],"},{"Add":" header: libpijul::change::ChangeHeader,"},{"Add":") -> Result<"},{"Add":" ("},{"Add":" usize,"},{"Add":" Option,"},{"Add":" Option,"},{"Add":" ),"},{"Add":" anyhow::Error,"},{"Add":"> {"},{"Add":" let mut state = libpijul::RecordBuilder::new();"},{"Add":" working_copy.record_prefixes(txn, channel, changes, &mut state, repo_path, prefixes)?;"},{"Add":" let rec = state.finish();"},{"Add":" if rec.actions.is_empty() {"},{"Add":" return Ok((0, None, txn.current_state(&channel.borrow())));"},{"Add":" }"},{"Add":" let actions: Vec<_> = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(txn))"},{"Add":" .collect();"},{"Add":" let n = actions.len();"},{"Add":" let (dependencies, extra_known) = libpijul::change::dependencies(txn, channel, actions.iter());"},{"Add":" let mut change = libpijul::change::LocalChange::make_change("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" actions,"},{"Add":" rec.contents,"},{"Add":" header,"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" change.dependencies = dependencies;"},{"Add":" change.extra_known = extra_known;"},{"Add":" debug!(\"saving change\");"},{"Add":" let hash = changes.save_change(&change).unwrap();"},{"Add":" debug!(\"saved\");"},{"Add":" let (_, m) = txn.apply_local_change(channel, &change, hash, &rec.updatables)?;"},{"Add":" Ok((n, Some(hash), Some(m)))"},{"Add":"}"},{"Add":""},{"Add":"struct Stats {"},{"Add":" child: git2::Oid,"},{"Add":" n_changes: usize,"},{"Add":" parent_application_time: std::time::Duration,"},{"Add":" output_time: std::time::Duration,"},{"Add":" reset_time: std::time::Duration,"},{"Add":" git_diff_time: std::time::Duration,"},{"Add":" record_time: std::time::Duration,"},{"Add":" n_actions: usize,"},{"Add":" n_files: usize,"},{"Add":" n_dirs: usize,"},{"Add":" total_size: u64,"},{"Add":" changes_size: u64,"},{"Add":" pristine_size: u64,"},{"Add":" hash: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Stats {"},{"Add":" fn new(child: git2::Oid) -> Self {"},{"Add":" let z = std::time::Duration::from_secs(0);"},{"Add":" Stats {"},{"Add":" child,"},{"Add":" n_changes: 0,"},{"Add":" parent_application_time: z,"},{"Add":" output_time: z,"},{"Add":" reset_time: z,"},{"Add":" git_diff_time: z,"},{"Add":" record_time: z,"},{"Add":" n_actions: 0,"},{"Add":" n_files: 0,"},{"Add":" n_dirs: 0,"},{"Add":" total_size: 0,"},{"Add":" changes_size: 0,"},{"Add":" pristine_size: 0,"},{"Add":" hash: None,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn write("},{"Add":" &mut self,"},{"Add":" n: usize,"},{"Add":" repo_path: &Path,"},{"Add":" f: &mut std::fs::File,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" // Count files."},{"Add":" let mut walk = ignore::WalkBuilder::new(&repo_path);"},{"Add":" walk.add_ignore(DOT_DIR).unwrap();"},{"Add":" for f in walk.build() {"},{"Add":" let meta = f?.metadata()?;"},{"Add":" if meta.is_dir() {"},{"Add":" self.n_dirs += 1"},{"Add":" } else {"},{"Add":" self.n_files += 1;"},{"Add":" self.total_size += meta.len();"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let dot_dir = repo_path.join(DOT_DIR);"},{"Add":" let pristine_dir = dot_dir.join(PRISTINE_DIR);"},{"Add":" let changes_dir = dot_dir.join(CHANGES_DIR);"},{"Add":" if let Ok(walk) = std::fs::read_dir(&pristine_dir) {"},{"Add":" for f in walk {"},{"Add":" let meta = f?.metadata()?;"},{"Add":" self.pristine_size += meta.len();"},{"Add":" }"},{"Add":" }"},{"Add":" if let Ok(walk) = std::fs::read_dir(&changes_dir) {"},{"Add":" for f in walk {"},{"Add":" let meta = f?.metadata()?;"},{"Add":" self.changes_size += meta.len();"},{"Add":" self.n_changes += 1"},{"Add":" }"},{"Add":" }"},{"Add":" let timers = libpijul::get_timers();"},{"Add":" writeln!("},{"Add":" f, \"{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}\","},{"Add":" self.child,"},{"Add":" n,"},{"Add":" self.parent_application_time.as_secs_f64(),"},{"Add":" timers.alive_output.as_secs_f64(),"},{"Add":" timers.alive_retrieve.as_secs_f64(),"},{"Add":" timers.alive_graph.as_secs_f64(),"},{"Add":" timers.alive_contents.as_secs_f64(),"},{"Add":" timers.alive_write.as_secs_f64(),"},{"Add":" timers.apply.as_secs_f64(),"},{"Add":" timers.record.as_secs_f64(),"},{"Add":" timers.repair_context.as_secs_f64(),"},{"Add":" timers.check_cyclic_paths.as_secs_f64(),"},{"Add":" timers.find_alive.as_secs_f64(),"},{"Add":" self.output_time.as_secs_f64(),"},{"Add":" self.reset_time.as_secs_f64(),"},{"Add":" self.git_diff_time.as_secs_f64(),"},{"Add":" self.record_time.as_secs_f64(),"},{"Add":" self.n_actions,"},{"Add":" self.n_files,"},{"Add":" self.n_dirs,"},{"Add":" self.total_size,"},{"Add":" self.changes_size,"},{"Add":" self.pristine_size,"},{"Add":" if let Some(ref h) = self.hash { h.to_base32() } else { String::new() },"},{"Add":" )?;"},{"Add":" libpijul::reset_timers();"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Check that each alive vertex in the graph is reachable, and vice-versa."},{"Add":"fn check_alive("},{"Add":" changes: &C,"},{"Add":" txn: &T,"},{"Add":" channel: &ChannelRef,"},{"Add":" line: u32,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let (alive, reachable) = txn.check_alive(&channel);"},{"Add":" let mut h = BTreeSet::new();"},{"Add":" if !alive.is_empty() {"},{"Add":" for (k, file) in alive.iter() {"},{"Add":" debug!(\"alive = {:?}, file = {:?}\", k, file);"},{"Add":" h.insert(file);"},{"Add":" }"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" for (k, file) in reachable.iter() {"},{"Add":" debug!(\"reachable = {:?}, file = {:?}\", k, file);"},{"Add":" h.insert(file);"},{"Add":" }"},{"Add":" }"},{"Add":" for file in h.iter() {"},{"Add":" let file_ = file.unwrap().start_pos();"},{"Add":" let mut f = std::fs::File::create(&format!(\"debug_{:?}\", file_))?;"},{"Add":" let graph = libpijul::alive::retrieve::retrieve(txn, &channel.borrow(), file_);"},{"Add":" graph.debug(changes, txn, &channel.borrow(), false, false, &mut f)?;"},{"Add":""},{"Add":" let mut f = std::fs::File::create(&format!(\"debug_all_{:?}\", file_))?;"},{"Add":" txn.debug_root(channel, file.unwrap(), &mut f)?;"},{"Add":" }"},{"Add":" if !h.is_empty() {"},{"Add":" panic!(\"alive call line {}\", line);"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Check that each inode in the inodes table maps to an alive vertex,"},{"Add":"/// and that each inode in the tree table is reachable by only one"},{"Add":"/// path."},{"Add":"fn check_tree_inodes(txn: &T, channel: &Channel) {"},{"Add":" // Sanity check"},{"Add":" for (inode, vertex) in txn.iter_inodes() {"},{"Add":" let mut inode_ = inode;"},{"Add":" while !inode_.is_root() {"},{"Add":" if let Some(next) = txn.get_revtree(inode_, None) {"},{"Add":" inode_ = next.parent_inode;"},{"Add":" } else {"},{"Add":" panic!(\"inode = {:?}, inode_ = {:?}\", inode, inode_);"},{"Add":" }"},{"Add":" }"},{"Add":" if !txn.is_alive(&channel, vertex.inode_vertex()) {"},{"Add":" for e in txn.iter_adjacent("},{"Add":" &channel,"},{"Add":" vertex.inode_vertex(),"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all(),"},{"Add":" ) {"},{"Add":" error!(\"{:?} {:?} {:?}\", inode, vertex, e)"},{"Add":" }"},{"Add":" panic!("},{"Add":" \"inode {:?}, vertex {:?}, is not alive, {:?}\","},{"Add":" inode,"},{"Add":" vertex,"},{"Add":" txn.tree_path(vertex)"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":" let mut h = HashMap::new();"},{"Add":" let id0 = OwnedPathId {"},{"Add":" parent_inode: Inode::ROOT,"},{"Add":" basename: libpijul::small_string::SmallString::new(),"},{"Add":" };"},{"Add":" for (id, inode) in txn.iter_tree(id0, None) {"},{"Add":" if let Some(inode_) = h.insert(id.clone(), inode) {"},{"Add":" panic!(\"id {:?} maps to two inodes: {:?} {:?}\", id, inode, inode_);"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"fork.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::pristine::{MutTxnT, TxnT};"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Fork {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\", conflicts_with = \"change\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"change\", conflicts_with = \"channel\")]"},{"Add":" change: Option,"},{"Add":" to: String,"},{"Add":"}"},{"Add":""},{"Add":"impl Fork {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" debug!(\"{:?}\", repo.config);"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" if let Some(ref ch) = self.change {"},{"Add":" let (hash, _) = txn.hash_from_prefix(ch)?;"},{"Add":" let mut channel = txn.open_or_create_channel(&self.to)?;"},{"Add":" txn.apply_change_rec(&repo.changes, &mut channel, hash)?"},{"Add":" } else {"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" if let Some(channel) = txn.load_channel(channel_name) {"},{"Add":" txn.fork(&channel, &self.to)?;"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"file_operations.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::pristine::MutTxnT;"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Mv {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" paths: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Mv {"},{"Add":" pub fn run(mut self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let to = if let Some(to) = self.paths.pop() {"},{"Add":" to"},{"Add":" } else {"},{"Add":" return Ok(());"},{"Add":" };"},{"Add":" let to = path(&self.repo_path, to);"},{"Add":" let is_dir = if let Ok(m) = std::fs::metadata(&to) {"},{"Add":" m.is_dir()"},{"Add":" } else {"},{"Add":" false"},{"Add":" };"},{"Add":" if !is_dir && self.paths.len() > 1 {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":""},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" for p in self.paths {"},{"Add":" debug!(\"p = {:?}\", p);"},{"Add":" let source = std::fs::canonicalize(&path(&self.repo_path, p.clone()))?;"},{"Add":" let target = if is_dir { to.join(p) } else { to.clone() };"},{"Add":" debug!(\"target = {:?}\", target);"},{"Add":" std::fs::rename(&source, &target)?;"},{"Add":" let target = std::fs::canonicalize(&target)?;"},{"Add":""},{"Add":" let source = source.strip_prefix(&repo.path)?;"},{"Add":" let target = target.strip_prefix(&repo.path)?;"},{"Add":" debug!(\"moving {:?} -> {:?}\", source, target);"},{"Add":" txn.move_file(&source.to_string_lossy(), &target.to_string_lossy())?"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn path(root: &Option, path: PathBuf) -> PathBuf {"},{"Add":" if let Some(ref p) = root {"},{"Add":" p.join(path)"},{"Add":" } else {"},{"Add":" path"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Ls {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Ls {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" for (_, p) in txn.iter_working_copy() {"},{"Add":" writeln!(stdout, \"{}\", p)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Add {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" paths: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Add {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut stderr = std::io::stderr();"},{"Add":" for path in self.paths.iter() {"},{"Add":" debug!(\"{:?}\", path);"},{"Add":""},{"Add":" if let Some(p) = path.file_name() {"},{"Add":" if let Some(p) = p.to_str() {"},{"Add":" if p.ends_with(\"~\") || (p.starts_with(\"#\") && p.ends_with(\"#\")) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let path = path.canonicalize()?;"},{"Add":" let meta = std::fs::metadata(&path)?;"},{"Add":" let path = if let Ok(path) = path.strip_prefix(&repo.path) {"},{"Add":" path"},{"Add":" } else {"},{"Add":" continue;"},{"Add":" };"},{"Add":" let path_str = path.to_str().unwrap();"},{"Add":" if !txn.is_tracked(&path_str) {"},{"Add":" writeln!(stderr, \"Adding {:?}\", path)?;"},{"Add":" info!(\"Adding {:?}\", path);"},{"Add":" txn.add(&path_str, meta.is_dir())?"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Remove {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" paths: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Remove {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" for path in self.paths.iter() {"},{"Add":" debug!(\"{:?}\", path);"},{"Add":""},{"Add":" if let Some(p) = path.file_name() {"},{"Add":" if let Some(p) = p.to_str() {"},{"Add":" if p.ends_with(\"~\") || (p.starts_with(\"#\") && p.ends_with(\"#\")) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let path = path.canonicalize()?;"},{"Add":" let path = if let Ok(path) = path.strip_prefix(&repo.path) {"},{"Add":" path"},{"Add":" } else {"},{"Add":" continue;"},{"Add":" };"},{"Add":" let path_str = path.to_str().unwrap();"},{"Add":" if txn.is_tracked(&path_str) {"},{"Add":" txn.remove_file(&path_str)?;"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"diff.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use libpijul::change::*;"},{"Add":"use libpijul::pristine::MutTxnT;"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use std::collections::BTreeMap;"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Diff {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" pub repo_path: Option,"},{"Add":" #[clap(long = \"json\")]"},{"Add":" pub json: bool,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" pub channel: Option,"},{"Add":" #[clap(long = \"tag\")]"},{"Add":" pub tag: bool,"},{"Add":" pub prefixes: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Diff {"},{"Add":" pub fn run(mut self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" let mut channel ="},{"Add":" txn.open_or_create_channel(repo.config.get_current_channel(self.channel.as_ref()))?;"},{"Add":""},{"Add":" let mut state = libpijul::RecordBuilder::new();"},{"Add":" if self.prefixes.is_empty() {"},{"Add":" txn.record("},{"Add":" &mut state,"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" &mut channel,"},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" \"\","},{"Add":" )?"},{"Add":" } else {"},{"Add":" self.fill_relative_prefixes()?;"},{"Add":" repo.working_copy.record_prefixes("},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" &repo.changes,"},{"Add":" &mut state,"},{"Add":" &repo.path,"},{"Add":" &self.prefixes,"},{"Add":" )?;"},{"Add":" }"},{"Add":" let rec = state.finish();"},{"Add":" if rec.actions.is_empty() {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" let actions = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(&txn))"},{"Add":" .collect();"},{"Add":" let mut change = LocalChange::make_change("},{"Add":" &txn,"},{"Add":" &channel,"},{"Add":" actions,"},{"Add":" rec.contents,"},{"Add":" ChangeHeader::default(),"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":""},{"Add":" let (dependencies, extra_known) = if self.tag {"},{"Add":" full_dependencies(&txn, &channel)"},{"Add":" } else {"},{"Add":" dependencies(&txn, &channel, change.changes.iter())"},{"Add":" };"},{"Add":" change.dependencies = dependencies;"},{"Add":" change.extra_known = extra_known;"},{"Add":""},{"Add":" if self.json {"},{"Add":" let mut changes = BTreeMap::new();"},{"Add":" for ch in change.changes.iter() {"},{"Add":" changes.entry(ch.path()).or_insert(Vec::new()).push(Status {"},{"Add":" operation: match ch {"},{"Add":" Record::FileMove { .. } => \"file move\","},{"Add":" Record::FileDel { .. } => \"file del\","},{"Add":" Record::FileUndel { .. } => \"file undel\","},{"Add":" Record::SolveNameConflict { .. } => \"solve name conflict\","},{"Add":" Record::UnsolveNameConflict { .. } => \"unsolve name conflict\","},{"Add":" Record::FileAdd { .. } => \"file add\","},{"Add":" Record::Edit { .. } => \"edit\","},{"Add":" Record::Replacement { .. } => \"replacement\","},{"Add":" Record::SolveOrderConflict { .. } => \"solve order conflict\","},{"Add":" Record::UnsolveOrderConflict { .. } => \"unsolve order conflict\","},{"Add":" Record::ResurrectZombies { .. } => \"resurrect zombies\","},{"Add":" },"},{"Add":" line: ch.line(),"},{"Add":" });"},{"Add":" }"},{"Add":" serde_json::to_writer_pretty(&mut std::io::stdout(), &changes)?;"},{"Add":" writeln!(stdout, \"\")?;"},{"Add":" } else {"},{"Add":" change.write("},{"Add":" &repo.changes,"},{"Add":" None,"},{"Add":" |local: &libpijul::change::Local, _| -> String {"},{"Add":" format!(\"{}:{}\", local.path, local.line)"},{"Add":" },"},{"Add":" true,"},{"Add":" &mut std::io::stdout(),"},{"Add":" )?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn fill_relative_prefixes(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" let cwd = std::env::current_dir()?;"},{"Add":" for p in self.prefixes.iter_mut() {"},{"Add":" if p.is_relative() {"},{"Add":" *p = cwd.join(&p);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Serialize)]"},{"Add":"struct Status {"},{"Add":" operation: &'static str,"},{"Add":" line: Option,"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"debug.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Debug {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Debug {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" use libpijul::pristine::TxnT;"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let channel = if let Some(channel) = txn.load_channel(&channel_name) {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" return Err((Error::NoSuchChannel {"},{"Add":" channel: channel_name.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" let channel = channel.borrow();"},{"Add":" txn.debug(&channel, std::io::stdout())?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"credit.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use libpijul::pristine::{ChangeId, Channel, EdgeFlags, TxnT, Vertex};"},{"Add":"use libpijul::vertex_buffer::VertexBuffer;"},{"Add":"use libpijul::TxnTExt;"},{"Add":"use std::collections::HashSet;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Credit {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" file: PathBuf,"},{"Add":"}"},{"Add":""},{"Add":"impl Credit {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let has_repo_path = self.repo_path.is_some();"},{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let channel = if let Some(channel) = txn.load_channel(&channel_name) {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" return Err((Error::NoSuchChannel {"},{"Add":" channel: channel_name.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" if self.channel.is_some() {"},{"Add":" repo.config.current_channel = self.channel;"},{"Add":" repo.save_config()?;"},{"Add":" }"},{"Add":" let (pos, _ambiguous) = if has_repo_path {"},{"Add":" let root = std::fs::canonicalize(repo.path.join(&self.file))?;"},{"Add":" let path = root.strip_prefix(&repo.path)?.to_str().unwrap();"},{"Add":" txn.follow_oldest_path(&repo.changes, &channel, &path)?"},{"Add":" } else {"},{"Add":" let path = self.file.to_str().unwrap();"},{"Add":" txn.follow_oldest_path(&repo.changes, &channel, &path)?"},{"Add":" };"},{"Add":" let channel_ = channel.borrow();"},{"Add":" txn.output_file("},{"Add":" &repo.changes,"},{"Add":" &channel,"},{"Add":" pos,"},{"Add":" &mut Creditor::new(std::io::stdout(), &txn, &channel_),"},{"Add":" )?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct Creditor<'a, W: std::io::Write, T: TxnT> {"},{"Add":" w: W,"},{"Add":" buf: Vec,"},{"Add":" new_line: bool,"},{"Add":" changes: HashSet,"},{"Add":" txn: &'a T,"},{"Add":" channel: &'a Channel,"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, W: std::io::Write, T: TxnT> Creditor<'a, W, T> {"},{"Add":" pub fn new(w: W, txn: &'a T, channel: &'a Channel) -> Self {"},{"Add":" Creditor {"},{"Add":" w,"},{"Add":" new_line: true,"},{"Add":" buf: Vec::new(),"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" changes: HashSet::new(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, W: std::io::Write, T: TxnT> VertexBuffer for Creditor<'a, W, T> {"},{"Add":" fn output_line) -> Result<(), anyhow::Error>>("},{"Add":" &mut self,"},{"Add":" v: Vertex,"},{"Add":" c: C,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"outputting vertex {:?}\", v);"},{"Add":" self.buf.clear();"},{"Add":" c(&mut self.buf)?;"},{"Add":""},{"Add":" use libpijul::pristine::Base32;"},{"Add":" if !v.change.is_root() {"},{"Add":" self.changes.clear();"},{"Add":" for e in self"},{"Add":" .txn"},{"Add":" .iter_adjacent(self.channel, v, EdgeFlags::PARENT, EdgeFlags::all())"},{"Add":" {"},{"Add":" self.changes.insert(e.introduced_by);"},{"Add":" }"},{"Add":" if !self.new_line {"},{"Add":" write!(self.w, \"\\n\")?;"},{"Add":" }"},{"Add":" let mut is_first = true;"},{"Add":" for c in self.changes.drain() {"},{"Add":" write!("},{"Add":" self.w,"},{"Add":" \"{}{}\","},{"Add":" if is_first { \"\" } else { \", \" },"},{"Add":" c.to_base32()"},{"Add":" )?;"},{"Add":" is_first = false;"},{"Add":" }"},{"Add":" writeln!(self.w, \"\")?;"},{"Add":" }"},{"Add":" let ends_with_newline = self.buf.ends_with(b\"\\n\");"},{"Add":" if let Ok(s) = std::str::from_utf8(&self.buf[..]) {"},{"Add":" for l in s.lines() {"},{"Add":" self.w.write_all(b\"> \")?;"},{"Add":" self.w.write_all(l.as_bytes())?;"},{"Add":" self.w.write_all(b\"\\n\")?;"},{"Add":" }"},{"Add":" }"},{"Add":" if !self.buf.is_empty() {"},{"Add":" // empty \"lines\" (such as in the beginning of a file)"},{"Add":" // don't change the status of self.new_line."},{"Add":" self.new_line = ends_with_newline;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error> {"},{"Add":" if !self.new_line {"},{"Add":" self.w.write(s.as_bytes())?;"},{"Add":" } else {"},{"Add":" self.w.write(&s.as_bytes()[1..])?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"clone.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use libpijul::pristine::MutTxnT;"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use std::path::PathBuf;"},{"Add":"use tempfile::TempDir;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Clone {"},{"Add":" #[clap(long = \"lazy\", about = \"only download changes with alive contents\")]"},{"Add":" lazy: bool,"},{"Add":" #[clap(long = \"channel\", about = \"set the remote channel\", default_value = crate::DEFAULT_CHANNEL)]"},{"Add":" channel: String,"},{"Add":" #[clap("},{"Add":" long = \"change\","},{"Add":" about = \"clone this change and its dependencies\","},{"Add":" conflicts_with = \"state\""},{"Add":" )]"},{"Add":" change: Option,"},{"Add":" #[clap(long = \"state\", about = \"clone this state\", conflicts_with = \"change\")]"},{"Add":" state: Option,"},{"Add":" #[clap(long = \"path\", about = \"clone this path\", multiple(true))]"},{"Add":" partial_paths: Vec,"},{"Add":" #[clap(short = 'k', about = \"Do not check certificates\")]"},{"Add":" no_cert_check: bool,"},{"Add":" remote: String,"},{"Add":" path: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Clone {"},{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut remote ="},{"Add":" crate::remote::unknown_remote(&self.remote, &self.channel, self.no_cert_check).await?;"},{"Add":""},{"Add":" let path = if let Some(path) = self.path {"},{"Add":" if path.is_relative() {"},{"Add":" let mut p = std::env::current_dir()?;"},{"Add":" p.push(path);"},{"Add":" p"},{"Add":" } else {"},{"Add":" path"},{"Add":" }"},{"Add":" } else if let Some(path) = remote.repo_name() {"},{"Add":" let mut p = std::env::current_dir()?;"},{"Add":" p.push(path);"},{"Add":" p"},{"Add":" } else {"},{"Add":" return Err((crate::Error::CouldNotInferRepositoryName { repo: self.remote }).into());"},{"Add":" };"},{"Add":" debug!(\"path = {:?}\", path);"},{"Add":" let parent = std::fs::canonicalize(path.parent().unwrap())?;"},{"Add":" let temp = TempDir::new_in(&parent)?;"},{"Add":" debug!(\"temp = {:?}\", temp.path());"},{"Add":" let mut repo = Repository::init(Some(temp.path().to_path_buf()))?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(&self.channel)?;"},{"Add":" if let Some(ref change) = self.change {"},{"Add":" let h = change.parse()?;"},{"Add":" remote"},{"Add":" .clone_tag(&mut repo, &mut txn, &mut channel, &[h])"},{"Add":" .await?"},{"Add":" } else if let Some(ref state) = self.state {"},{"Add":" let h = state.parse()?;"},{"Add":" remote"},{"Add":" .clone_state(&mut repo, &mut txn, &mut channel, h, self.lazy)"},{"Add":" .await?"},{"Add":" } else {"},{"Add":" remote"},{"Add":" .clone_channel("},{"Add":" &mut repo,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" self.lazy,"},{"Add":" &self.partial_paths,"},{"Add":" )"},{"Add":" .await?;"},{"Add":" }"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.commit()?;"},{"Add":" repo.config.current_channel = Some(self.channel);"},{"Add":" repo.save_config()?;"},{"Add":" std::fs::rename(&temp.into_path(), &path)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"checkout.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::pristine::{MutTxnT, TxnT};"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Checkout {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" channel: String,"},{"Add":"}"},{"Add":""},{"Add":"impl Checkout {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"},{"Add":" debug!(\"{:?}\", repo.config);"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" if let Some(mut channel) = txn.load_channel(&self.channel) {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" }"},{"Add":" txn.commit()?;"},{"Add":" repo.config.current_channel = Some(self.channel);"},{"Add":" repo.save_config()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"channel.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::pristine::{MutTxnT, TxnT};"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Channel {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(subcommand)]"},{"Add":" subcmd: Option,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub enum SubCommand {"},{"Add":" #[clap(name = \"delete\")]"},{"Add":" Delete { delete: String },"},{"Add":" #[clap(name = \"rename\")]"},{"Add":" Rename { from: String, to: Option },"},{"Add":"}"},{"Add":""},{"Add":"impl Channel {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path)?;"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" let current = if let Some(ref c) = repo.config.current_channel {"},{"Add":" Some(c.as_str())"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" match self.subcmd {"},{"Add":" None => {"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" for channel in txn.iter_channels(\"\") {"},{"Add":" let channel = channel.borrow();"},{"Add":" let name = channel.name();"},{"Add":" if current == Some(name) {"},{"Add":" writeln!(stdout, \"* {}\", name)?;"},{"Add":" } else {"},{"Add":" writeln!(stdout, \" {}\", name)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Some(SubCommand::Delete { ref delete }) => {"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" txn.drop_channel(delete)?;"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":" Some(SubCommand::Rename { ref from, ref to }) => {"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let (from, to) = if let Some(to) = to {"},{"Add":" (from.as_str(), to.as_str())"},{"Add":" } else if let Some(current) = current {"},{"Add":" (current, from.as_str())"},{"Add":" } else {"},{"Add":" return Err(crate::Error::NoCurrentChannel.into());"},{"Add":" };"},{"Add":" let mut channel = if let Some(channel) = txn.load_channel(from) {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" return Err((crate::Error::ChannelNotFound {"},{"Add":" channel: from.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" txn.rename_channel(&mut channel, to)?;"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"change.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::*;"},{"Add":"use libpijul::change::Local;"},{"Add":"use libpijul::changestore::ChangeStore;"},{"Add":"use libpijul::pristine::*;"},{"Add":"use libpijul::*;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Change {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" hash: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Change {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let repo = Repository::find_root(self.repo_path.clone())?;"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let channel = txn.load_channel(channel_name).unwrap();"},{"Add":" let changes = repo.changes;"},{"Add":""},{"Add":" let hash = if let Some(hash) = self.hash {"},{"Add":" txn.hash_from_prefix(&hash)?.0"},{"Add":" } else if let Some((_, (h, _))) = txn.reverse_log(&channel.borrow(), None).next() {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Ok(());"},{"Add":" };"},{"Add":""},{"Add":" let change = changes.get_change(&hash).unwrap();"},{"Add":" let file_name = |l: &Local, inode: Position>| -> String {"},{"Add":" if txn.get_revchanges(&channel, hash).is_some() {"},{"Add":" let inode = Position {"},{"Add":" change: inode.change.unwrap_or(hash),"},{"Add":" pos: inode.pos,"},{"Add":" };"},{"Add":" format!("},{"Add":" \"{}:{}\","},{"Add":" txn.find_youngest_path(&changes, &channel, inode).unwrap().0,"},{"Add":" l.line"},{"Add":" )"},{"Add":" } else {"},{"Add":" format!(\"{}:{}\", l.path, l.line)"},{"Add":" }"},{"Add":" };"},{"Add":" let o = std::io::stdout();"},{"Add":" let mut o = o.lock();"},{"Add":" change.write(&changes, Some(hash), file_name, true, &mut o)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"archive.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use libpijul::pristine::{Hash, Merkle, TxnT};"},{"Add":"use libpijul::{MutTxnTExt, TxnTExt};"},{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Archive {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"remote\")]"},{"Add":" remote: Option,"},{"Add":" #[clap(short = 'k', about = \"Do not check certificates\")]"},{"Add":" no_cert_check: bool,"},{"Add":" #[clap(long = \"state\")]"},{"Add":" state: Option,"},{"Add":" #[clap(long = \"change\", multiple = true)]"},{"Add":" change: Vec,"},{"Add":" #[clap(long = \"prefix\")]"},{"Add":" prefix: Option,"},{"Add":" #[clap(short = 'o')]"},{"Add":" name: String,"},{"Add":"}"},{"Add":""},{"Add":"impl Archive {"},{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let state: Option = if let Some(ref state) = self.state {"},{"Add":" Some(state.parse()?)"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" let mut extra: Vec = Vec::new();"},{"Add":" for h in self.change.iter() {"},{"Add":" extra.push(h.parse()?);"},{"Add":" }"},{"Add":""},{"Add":" if let Some(ref rem) = self.remote {"},{"Add":" debug!(\"unknown\");"},{"Add":" let mut remote = crate::remote::unknown_remote("},{"Add":" rem,"},{"Add":" if let Some(ref channel) = self.channel {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" crate::DEFAULT_CHANNEL"},{"Add":" },"},{"Add":" self.no_cert_check,"},{"Add":" )"},{"Add":" .await?;"},{"Add":" let mut p = std::path::Path::new(&self.name).to_path_buf();"},{"Add":" if !self.name.ends_with(\".tar.gz\") {"},{"Add":" p.set_extension(\"tar.gz\");"},{"Add":" }"},{"Add":" let mut f = std::fs::File::create(&p)?;"},{"Add":" remote"},{"Add":" .archive(self.prefix, state.map(|x| (x, &extra[..])), &mut f)"},{"Add":" .await?;"},{"Add":" } else if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let mut p = std::path::Path::new(&self.name).to_path_buf();"},{"Add":" if !self.name.ends_with(\".tar.gz\") {"},{"Add":" p.set_extension(\"tar.gz\");"},{"Add":" }"},{"Add":" let mut f = std::fs::File::create(&p)?;"},{"Add":" let mut tarball = libpijul::output::Tarball::new(&mut f, self.prefix);"},{"Add":" let conflicts = if let Some(state) = state {"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" let mut channel = txn.load_channel(&channel_name).unwrap();"},{"Add":" txn.archive_with_state("},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" state,"},{"Add":" &extra[..],"},{"Add":" &mut tarball,"},{"Add":" )?"},{"Add":" } else {"},{"Add":" let txn = repo.pristine.txn_begin()?;"},{"Add":" let channel = txn.load_channel(&channel_name).unwrap();"},{"Add":" txn.archive(&repo.changes, &channel, &mut tarball)?"},{"Add":" };"},{"Add":" if !conflicts.is_empty() {"},{"Add":" writeln!("},{"Add":" std::io::stderr(),"},{"Add":" \"There were {} conflicts\","},{"Add":" conflicts.len()"},{"Add":" )?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"apply.rs","metadata":420},"context":[{"change":0,"pos":93386}],"contents":[{"Add":"use crate::repository::Repository;"},{"Add":"use crate::Error;"},{"Add":"use libpijul::changestore::ChangeStore;"},{"Add":"use libpijul::pristine::MutTxnT;"},{"Add":"use libpijul::MutTxnTExt;"},{"Add":"use std::collections::HashMap;"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Apply {"},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"deps-only\")]"},{"Add":" deps_only: bool,"},{"Add":" change: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Apply {"},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut repo = Repository::find_root(self.repo_path)?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin();"},{"Add":" use libpijul::pristine::TxnT;"},{"Add":" let channel_name = repo.config.get_current_channel(self.channel.as_ref());"},{"Add":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name) {"},{"Add":" channel"},{"Add":" } else if self.change.is_some() {"},{"Add":" txn.open_or_create_channel(&channel_name)?"},{"Add":" } else {"},{"Add":" return Err((Error::NoSuchChannel {"},{"Add":" channel: channel_name.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" };"},{"Add":" let hash = if let Some(ch) = self.change {"},{"Add":" if let Ok(h) = txn.hash_from_prefix(&ch) {"},{"Add":" h.0"},{"Add":" } else {"},{"Add":" let change = libpijul::change::Change::deserialize(&ch, None)?;"},{"Add":" repo.changes.save_change(&change)?"},{"Add":" }"},{"Add":" } else {"},{"Add":" let mut change = std::io::BufReader::new(std::io::stdin());"},{"Add":" let change = libpijul::change::Change::read(&mut change, &mut HashMap::new())?;"},{"Add":" repo.changes.save_change(&change)?"},{"Add":" };"},{"Add":" if self.deps_only {"},{"Add":" txn.apply_deps_rec(&repo.changes, &mut channel, hash)?;"},{"Add":" } else {"},{"Add":" txn.apply_change_rec(&repo.changes, &mut channel, hash)?;"},{"Add":" }"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"Cargo.toml","metadata":420},"context":[{"change":0,"pos":21407}],"contents":[{"Add":"[package]"},{"Add":"name = \"pijul\""},{"Add":"description = \"The sound distributed version control system.\""},{"Add":"version = \"1.0.0-alpha.1\""},{"Add":"authors = [\"Pierre-Étienne Meunier \"]"},{"Add":"edition = \"2018\""},{"Add":"repository = \"https://nest.pijul.com/pijul/pijul\""},{"Add":"license = \"GPL-2.0\""},{"Add":"include = ["},{"Add":"\"Cargo.toml\","},{"Add":"\"src\","},{"Add":"\"src/commands\","},{"Add":"\"src/commands/log.rs\","},{"Add":"\"src/commands/protocol.rs\","},{"Add":"\"src/commands/apply.rs\","},{"Add":"\"src/commands/debug.rs\","},{"Add":"\"src/commands/checkout.rs\","},{"Add":"\"src/commands/file_operations.rs\","},{"Add":"\"src/commands/clone.rs\","},{"Add":"\"src/commands/git.rs\","},{"Add":"\"src/commands/record.rs\","},{"Add":"\"src/commands/change.rs\","},{"Add":"\"src/commands/diff.rs\","},{"Add":"\"src/commands/unrecord.rs\","},{"Add":"\"src/commands/channel.rs\","},{"Add":"\"src/commands/init.rs\","},{"Add":"\"src/commands/mod.rs\","},{"Add":"\"src/commands/archive.rs\","},{"Add":"\"src/commands/reset.rs\","},{"Add":"\"src/commands/fork.rs\","},{"Add":"\"src/commands/pushpull.rs\","},{"Add":"\"src/config.rs\","},{"Add":"\"src/repository.rs\","},{"Add":"\"src/main.rs\","},{"Add":"\"src/remote\","},{"Add":"\"src/remote/local.rs\","},{"Add":"\"src/remote/ssh.rs\","},{"Add":"\"src/remote/mod.rs\","},{"Add":"]"},{"Add":"[features]"},{"Add":"git = [ \"git2\", \"sanakirja/git2\" ]"},{"Add":"default = [ ]"},{"Add":""},{"Add":"[dependencies]"},{"Add":"human-panic = \"1.0\""},{"Add":"clap = \"3.0.0-beta.2\""},{"Add":"anyhow = \"1.0\""},{"Add":"thiserror = \"1.0\""},{"Add":"libpijul = { version = \"1.0.0-alpha.1\", features = [ \"tarball\" ] }"},{"Add":"chrono = { version = \"0.4\" }"},{"Add":"ignore = \"0.4\""},{"Add":"env_logger = \"0.8\""},{"Add":"log = \"0.4\""},{"Add":"serde = \"1.0\""},{"Add":"serde_json = \"1.0\""},{"Add":"serde_derive = \"1.0\""},{"Add":"toml = \"0.5\""},{"Add":"tokio = { version = \"0.2\", features = [ \"rt-threaded\", \"macros\", \"sync\" ] }"},{"Add":"thrussh = \"0.29\""},{"Add":"thrussh-keys = \"0.18.2\""},{"Add":"cryptovec = \"0.5\""},{"Add":"reqwest = { version = \"0.10\", features = [ \"stream\" ] }"},{"Add":"byteorder = \"1.3\""},{"Add":"sanakirja = \"0.13.1\""},{"Add":"futures = \"0.3\""},{"Add":"dirs-next = \"2.0\""},{"Add":"lazy_static = \"1.4\""},{"Add":"regex = \"1.4\""},{"Add":"whoami = \"0.9\""},{"Add":"rpassword = \"5.0\""},{"Add":"git2 = { version = \"0.13\", optional = true }"},{"Add":"rand = \"0.7\""},{"Add":"edit = \"0.1\""},{"Add":"data-encoding = \"2.3\""},{"Add":"futures-util = \"0.3\""},{"Add":"tempfile = \"3.1\""}]}},{"FileAdd":{"meta":{"basename":"libpijul","metadata":1005},"context":[{"change":1,"pos":0}],"contents":[]}},{"FileAdd":{"meta":{"basename":"src","metadata":1005},"context":[{"change":0,"pos":198139}],"contents":[]}},{"FileAdd":{"meta":{"basename":"working_copy","metadata":1005},"context":[{"change":0,"pos":198146}],"contents":[]}},{"FileAdd":{"meta":{"basename":"mod.rs","metadata":420},"context":[{"change":0,"pos":198162}],"contents":[{"Add":"// org id jgSEtEI/xIjz/bF+vtGtYbEA9bNIeFWLqnZT+M51S64="},{"Add":"use crate::pristine::InodeMetadata;"},{"Add":""},{"Add":"#[cfg(feature = \"ondisk-repos\")]"},{"Add":"pub mod filesystem;"},{"Add":"#[cfg(feature = \"ondisk-repos\")]"},{"Add":"pub use filesystem::FileSystem;"},{"Add":""},{"Add":"pub mod memory;"},{"Add":"pub use memory::Memory;"},{"Add":""},{"Add":"pub trait WorkingCopy {"},{"Add":" fn create_dir_all(&mut self, path: &str) -> Result<(), anyhow::Error>;"},{"Add":" fn file_metadata(&self, file: &str) -> Result;"},{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), anyhow::Error>;"},{"Add":" fn modified_time(&self, file: &str) -> Result;"},{"Add":" fn remove_path(&mut self, name: &str) -> Result<(), anyhow::Error>;"},{"Add":" fn rename(&mut self, former: &str, new: &str) -> Result<(), anyhow::Error>;"},{"Add":" fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), anyhow::Error>;"},{"Add":" fn write_file Result>("},{"Add":" &mut self,"},{"Add":" file: &str,"},{"Add":" writer: F,"},{"Add":" ) -> Result;"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"memory.rs","metadata":420},"context":[{"change":0,"pos":198162}],"contents":[{"Add":"// org id 0KxFIPg0ga5vhSwltRkYUH0GqkExY80aPF4KPWp42YI="},{"Add":"use super::*;"},{"Add":"use crate::pristine::InodeMetadata;"},{"Add":"use std::collections::HashMap;"},{"Add":"use std::time::SystemTime;"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"pub struct Memory {"},{"Add":" pub files: FileTree,"},{"Add":" pub last_modified: SystemTime,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"pub struct FileTree {"},{"Add":" children: HashMap,"},{"Add":"}"},{"Add":"#[derive(Debug)]"},{"Add":"enum Inode {"},{"Add":" File {"},{"Add":" meta: InodeMetadata,"},{"Add":" last_modified: SystemTime,"},{"Add":" contents: Vec,"},{"Add":" },"},{"Add":" Directory {"},{"Add":" meta: InodeMetadata,"},{"Add":" last_modified: SystemTime,"},{"Add":" children: FileTree,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"impl Memory {"},{"Add":" pub fn new() -> Self {"},{"Add":" Memory {"},{"Add":" files: FileTree {"},{"Add":" children: HashMap::new(),"},{"Add":" },"},{"Add":" last_modified: SystemTime::now(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn list_files(&self) -> Vec {"},{"Add":" let mut result = Vec::new();"},{"Add":" let mut current_files = vec![(String::new(), &self.files)];"},{"Add":" let mut next_files = Vec::new();"},{"Add":" loop {"},{"Add":" if current_files.is_empty() {"},{"Add":" break;"},{"Add":" }"},{"Add":" for (path, tree) in current_files.iter() {"},{"Add":" for (name, inode) in tree.children.iter() {"},{"Add":" let mut path = path.clone();"},{"Add":" crate::path::push(&mut path, name);"},{"Add":" match inode {"},{"Add":" Inode::File { .. } => {"},{"Add":" result.push(path);"},{"Add":" }"},{"Add":" Inode::Directory { ref children, .. } => {"},{"Add":" result.push(path.clone());"},{"Add":" next_files.push((path, children))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" std::mem::swap(&mut current_files, &mut next_files);"},{"Add":" next_files.clear();"},{"Add":" }"},{"Add":" result"},{"Add":" }"},{"Add":""},{"Add":" pub fn add_file(&mut self, file: &str, file_contents: Vec) {"},{"Add":" let file_meta = InodeMetadata::new(0o644, false);"},{"Add":" let last = SystemTime::now();"},{"Add":" self.add_inode("},{"Add":" file,"},{"Add":" Inode::File {"},{"Add":" meta: file_meta,"},{"Add":" last_modified: last,"},{"Add":" contents: file_contents,"},{"Add":" },"},{"Add":" )"},{"Add":" }"},{"Add":""},{"Add":" pub fn add_dir(&mut self, file: &str) {"},{"Add":" let file_meta = InodeMetadata::new(0o755, true);"},{"Add":" let last = SystemTime::now();"},{"Add":" self.add_inode("},{"Add":" file,"},{"Add":" Inode::Directory {"},{"Add":" meta: file_meta,"},{"Add":" last_modified: last,"},{"Add":" children: FileTree {"},{"Add":" children: HashMap::new(),"},{"Add":" },"},{"Add":" },"},{"Add":" )"},{"Add":" }"},{"Add":""},{"Add":" fn add_inode(&mut self, file: &str, inode: Inode) {"},{"Add":" let mut file_tree = &mut self.files;"},{"Add":" let last = SystemTime::now();"},{"Add":" self.last_modified = last;"},{"Add":" let file = file.split('/').filter(|c| !c.is_empty());"},{"Add":" let mut p = file.peekable();"},{"Add":" while let Some(f) = p.next() {"},{"Add":" if p.peek().is_some() {"},{"Add":" let entry = file_tree"},{"Add":" .children"},{"Add":" .entry(f.to_string())"},{"Add":" .or_insert(Inode::Directory {"},{"Add":" meta: InodeMetadata::new(0o755, true),"},{"Add":" children: FileTree {"},{"Add":" children: HashMap::new(),"},{"Add":" },"},{"Add":" last_modified: last,"},{"Add":" });"},{"Add":" match *entry {"},{"Add":" Inode::Directory {"},{"Add":" ref mut children, .."},{"Add":" } => file_tree = children,"},{"Add":" _ => panic!(\"Not a directory\"),"},{"Add":" }"},{"Add":" } else {"},{"Add":" file_tree.children.insert(f.to_string(), inode);"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn get_file(&self, file: &str) -> Option<&Inode> {"},{"Add":" debug!(\"get_file {:?}\", file);"},{"Add":" debug!(\"repo = {:?}\", self);"},{"Add":" let mut t = Some(&self.files);"},{"Add":" let mut inode = None;"},{"Add":" let mut it = file.split('/').filter(|c| !c.is_empty());"},{"Add":" while let Some(c) = it.next() {"},{"Add":" debug!(\"c = {:?}\", c);"},{"Add":" inode = t.take().unwrap().children.get(c);"},{"Add":" debug!(\"inode = {:?}\", inode);"},{"Add":" match inode {"},{"Add":" Some(Inode::Directory { ref children, .. }) => t = Some(children),"},{"Add":" _ => break,"},{"Add":" }"},{"Add":" }"},{"Add":" inode"},{"Add":" }"},{"Add":""},{"Add":" fn get_file_mut<'a>(&'a mut self, file: &str) -> Option<&'a mut Inode> {"},{"Add":" debug!(\"get_file_mut {:?}\", file);"},{"Add":" debug!(\"repo = {:?}\", self);"},{"Add":" let mut t = Some(&mut self.files);"},{"Add":" let mut it = file.split('/').filter(|c| !c.is_empty()).peekable();"},{"Add":" self.last_modified = SystemTime::now();"},{"Add":" while let Some(c) = it.next() {"},{"Add":" debug!(\"c = {:?}\", c);"},{"Add":" let inode_ = t.take().unwrap().children.get_mut(c);"},{"Add":" debug!(\"inode = {:?}\", inode_);"},{"Add":" if it.peek().is_none() {"},{"Add":" return inode_;"},{"Add":" }"},{"Add":" match inode_ {"},{"Add":" Some(Inode::Directory {"},{"Add":" ref mut children, .."},{"Add":" }) => t = Some(children),"},{"Add":" _ => return None,"},{"Add":" }"},{"Add":" }"},{"Add":" None"},{"Add":" }"},{"Add":""},{"Add":" fn remove_path_(&mut self, path: &str) -> Option {"},{"Add":" debug!(\"remove_path {:?}\", path);"},{"Add":" debug!(\"repo = {:?}\", self);"},{"Add":" let mut t = Some(&mut self.files);"},{"Add":" let mut it = path.split('/').filter(|c| !c.is_empty());"},{"Add":" let mut c = it.next().unwrap();"},{"Add":" self.last_modified = SystemTime::now();"},{"Add":" loop {"},{"Add":" debug!(\"c = {:?}\", c);"},{"Add":" let next_c = it.next();"},{"Add":" let t_ = t.take().unwrap();"},{"Add":" let next_c = if let Some(next_c) = next_c {"},{"Add":" next_c"},{"Add":" } else {"},{"Add":" return t_.children.remove(c);"},{"Add":" };"},{"Add":" let inode = t_.children.get_mut(c);"},{"Add":" c = next_c;"},{"Add":" debug!(\"inode = {:?}\", inode);"},{"Add":" match inode {"},{"Add":" Some(Inode::Directory {"},{"Add":" ref mut children, .."},{"Add":" }) => t = Some(children),"},{"Add":" _ => return None,"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WorkingCopy for Memory {"},{"Add":" fn create_dir_all(&mut self, file: &str) -> Result<(), anyhow::Error> {"},{"Add":" if self.get_file(file).is_none() {"},{"Add":" let last = SystemTime::now();"},{"Add":" self.add_inode("},{"Add":" file,"},{"Add":" Inode::Directory {"},{"Add":" meta: InodeMetadata::new(0o755, true),"},{"Add":" children: FileTree {"},{"Add":" children: HashMap::new(),"},{"Add":" },"},{"Add":" last_modified: last,"},{"Add":" },"},{"Add":" );"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" fn file_metadata(&self, file: &str) -> Result {"},{"Add":" match self.get_file(file) {"},{"Add":" Some(Inode::Directory { meta, .. }) => Ok(*meta),"},{"Add":" Some(Inode::File { meta, .. }) => Ok(*meta),"},{"Add":" None => Err((crate::Error::FileNotFound {"},{"Add":" path: file.to_string(),"},{"Add":" })"},{"Add":" .into()),"},{"Add":" }"},{"Add":" }"},{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), anyhow::Error> {"},{"Add":" match self.get_file(file) {"},{"Add":" Some(Inode::Directory { .. }) => panic!(\"Not a file: {:?}\", file),"},{"Add":" Some(Inode::File { ref contents, .. }) => {"},{"Add":" buffer.extend(contents);"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" None => {"},{"Add":" return Err((crate::Error::FileNotFound {"},{"Add":" path: file.to_string(),"},{"Add":" })"},{"Add":" .into())"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" fn modified_time(&self, _file: &str) -> Result {"},{"Add":" Ok(self.last_modified)"},{"Add":" }"},{"Add":""},{"Add":" fn remove_path(&mut self, path: &str) -> Result<(), anyhow::Error> {"},{"Add":" self.remove_path_(path);"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn rename(&mut self, old: &str, new: &str) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"rename {:?} to {:?}\", old, new);"},{"Add":" if let Some(inode) = self.remove_path_(old) {"},{"Add":" self.add_inode(new, inode)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" fn set_permissions(&mut self, file: &str, permissions: u16) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"set_permissions {:?}\", file);"},{"Add":" match self.get_file_mut(file) {"},{"Add":" Some(Inode::File { ref mut meta, .. }) => {"},{"Add":" *meta = InodeMetadata::new(permissions as usize, false);"},{"Add":" }"},{"Add":" Some(Inode::Directory { ref mut meta, .. }) => {"},{"Add":" *meta = InodeMetadata::new(permissions as usize, true);"},{"Add":" }"},{"Add":" None => panic!(\"file not found: {:?}\", file),"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" fn write_file Result>("},{"Add":" &mut self,"},{"Add":" file: &str,"},{"Add":" writer: F,"},{"Add":" ) -> Result {"},{"Add":" match self.get_file_mut(file) {"},{"Add":" Some(Inode::File {"},{"Add":" ref mut contents, .."},{"Add":" }) => {"},{"Add":" contents.clear();"},{"Add":" writer(contents)"},{"Add":" }"},{"Add":" None => {"},{"Add":" let mut contents = Vec::new();"},{"Add":" let last_modified = SystemTime::now();"},{"Add":" let a = writer(&mut contents)?;"},{"Add":" self.add_inode("},{"Add":" file,"},{"Add":" Inode::File {"},{"Add":" meta: InodeMetadata::new(0o644, false),"},{"Add":" contents,"},{"Add":" last_modified,"},{"Add":" },"},{"Add":" );"},{"Add":" Ok(a)"},{"Add":" }"},{"Add":" _ => panic!(\"not a file: {:?}\", file),"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"filesystem.rs","metadata":420},"context":[{"change":0,"pos":198162}],"contents":[{"Add":"// org id c2D/NoY1VKCjNo0OezNVrmuG67Szl/Bfhi3G2Z7tcLU="},{"Add":"use super::*;"},{"Add":"use crate::pristine::InodeMetadata;"},{"Add":"use ignore::WalkBuilder;"},{"Add":"use std::path::{Path, PathBuf};"},{"Add":""},{"Add":"pub struct FileSystem {"},{"Add":" root: PathBuf,"},{"Add":"}"},{"Add":""},{"Add":"pub fn get_prefix("},{"Add":" repo_path: Option<&Path>,"},{"Add":" prefix: &Path,"},{"Add":") -> Result<(PathBuf, String), anyhow::Error> {"},{"Add":" let mut p = String::new();"},{"Add":" let repo = if let Some(repo) = repo_path {"},{"Add":" std::fs::canonicalize(repo)?"},{"Add":" } else {"},{"Add":" std::env::current_dir()?"},{"Add":" };"},{"Add":" debug!(\"get prefix {:?}\", repo);"},{"Add":" let prefix_ = if let Ok(prefix_) = std::fs::canonicalize(repo.join(&prefix)) {"},{"Add":" prefix_"},{"Add":" } else {"},{"Add":" repo.join(&prefix)"},{"Add":" };"},{"Add":" debug!(\"get prefix {:?}\", prefix_);"},{"Add":" if let Ok(prefix) = prefix_.strip_prefix(repo) {"},{"Add":" for c in prefix.components() {"},{"Add":" if !p.is_empty() {"},{"Add":" p.push('/');"},{"Add":" }"},{"Add":" let c: &std::path::Path = c.as_ref();"},{"Add":" p.push_str(&c.to_string_lossy())"},{"Add":" }"},{"Add":" }"},{"Add":" Ok((prefix_, p))"},{"Add":"}"},{"Add":""},{"Add":"impl FileSystem {"},{"Add":" pub fn from_root>(root: P) -> Self {"},{"Add":" FileSystem {"},{"Add":" root: root.as_ref().to_path_buf(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn record_prefixes<"},{"Add":" T: crate::MutTxnTExt + crate::TxnTExt,"},{"Add":" C: crate::changestore::ChangeStore,"},{"Add":" P: AsRef,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut crate::pristine::ChannelRef,"},{"Add":" changes: &C,"},{"Add":" state: &mut crate::RecordBuilder,"},{"Add":" repo_path: &Path,"},{"Add":" prefixes: &[P],"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" for prefix in prefixes.iter() {"},{"Add":" if let Err(e) ="},{"Add":" self.record_prefix(txn, channel, changes, state, repo_path, prefix.as_ref())"},{"Add":" {"},{"Add":" eprintln!(\"{}\", e)"},{"Add":" }"},{"Add":" }"},{"Add":" if prefixes.is_empty() {"},{"Add":" if let Err(e) ="},{"Add":" self.record_prefix(txn, channel, changes, state, repo_path, Path::new(\"\"))"},{"Add":" {"},{"Add":" eprintln!(\"{}\", e)"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn record_prefix<"},{"Add":" T: crate::MutTxnTExt + crate::TxnTExt,"},{"Add":" C: crate::changestore::ChangeStore,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut crate::pristine::ChannelRef,"},{"Add":" changes: &C,"},{"Add":" state: &mut crate::RecordBuilder,"},{"Add":" repo_path: &Path,"},{"Add":" prefix: &Path,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"record_prefix {:?}\", prefix);"},{"Add":" let repo_path_ = std::fs::canonicalize(repo_path)?;"},{"Add":" if let Ok((full, prefix)) = get_prefix(Some(&repo_path), prefix) {"},{"Add":" debug!(\"full = {:?}\", full);"},{"Add":" let meta = std::fs::metadata(&full);"},{"Add":" debug!(\"meta = {:?}\", meta);"},{"Add":" debug!(\"{:?}\", full.strip_prefix(&repo_path_));"},{"Add":" if let Ok(meta) = meta {"},{"Add":" if meta.is_dir() {"},{"Add":" let mut walk = WalkBuilder::new(&full);"},{"Add":" walk.standard_filters(true);"},{"Add":" let walk = walk.build();"},{"Add":" for entry in walk {"},{"Add":" let entry = entry?;"},{"Add":" let p = entry.path();"},{"Add":" if let Some(p) = p.file_name() {"},{"Add":" if let Some(p) = p.to_str() {"},{"Add":" if p.ends_with(\"~\") || (p.starts_with(\"#\") && p.ends_with(\"#\")) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"entry path = {:?} {:?}\", entry.path(), repo_path);"},{"Add":" if let Ok(path) = entry.path().strip_prefix(&repo_path_) {"},{"Add":" let path_str = path.to_str().unwrap();"},{"Add":" if !txn.is_tracked(&path_str) {"},{"Add":" eprintln!(\"Adding {:?}\", path);"},{"Add":" info!(\"Adding {:?}\", path);"},{"Add":" txn.add(path_str, entry.file_type().unwrap().is_dir())?"},{"Add":" } else {"},{"Add":" debug!(\"already tracked {:?}\", path_str)"},{"Add":" }"},{"Add":" } else {"},{"Add":" debug!(\"entry = {:?}\", entry.path());"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Ok(path) = full.strip_prefix(&repo_path_) {"},{"Add":" let path_str = path.to_str().unwrap();"},{"Add":" if !txn.is_tracked(&path_str) {"},{"Add":" eprintln!(\"Adding {:?}\", path);"},{"Add":" info!(\"Adding file {:?}\", path);"},{"Add":" txn.add(path_str, false)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"recording from prefix {:?}\", prefix);"},{"Add":" txn.record("},{"Add":" state,"},{"Add":" crate::Algorithm::default(),"},{"Add":" channel,"},{"Add":" self,"},{"Add":" changes,"},{"Add":" &prefix,"},{"Add":" )?;"},{"Add":" debug!(\"recorded\");"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WorkingCopy for FileSystem {"},{"Add":" fn create_dir_all(&mut self, file: &str) -> Result<(), anyhow::Error> {"},{"Add":" Ok(std::fs::create_dir_all(&self.root.join(file))?)"},{"Add":" }"},{"Add":" fn file_metadata(&self, file: &str) -> Result {"},{"Add":" let attr = std::fs::metadata(&self.root.join(file))?;"},{"Add":" let permissions = permissions(&attr).unwrap_or(0o755);"},{"Add":" debug!(\"permissions = {:?}\", permissions);"},{"Add":" Ok(InodeMetadata::new(permissions & 0o777, attr.is_dir()))"},{"Add":" }"},{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), anyhow::Error> {"},{"Add":" use std::io::Read;"},{"Add":" let mut f = std::fs::File::open(&self.root.join(file))?;"},{"Add":" f.read_to_end(buffer)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" fn modified_time(&self, file: &str) -> Result {"},{"Add":" let attr = std::fs::metadata(&self.root.join(file))?;"},{"Add":" Ok(attr.modified()?)"},{"Add":" }"},{"Add":""},{"Add":" fn remove_path(&mut self, path: &str) -> Result<(), anyhow::Error> {"},{"Add":" let path = self.root.join(path);"},{"Add":" if let Ok(meta) = std::fs::metadata(&path) {"},{"Add":" if let Err(e) = if meta.is_dir() {"},{"Add":" std::fs::remove_dir_all(&path)"},{"Add":" } else {"},{"Add":" std::fs::remove_file(&path)"},{"Add":" } {"},{"Add":" error!(\"while deleting {:?}: {:?}\", path, e);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" fn rename(&mut self, former: &str, new: &str) -> Result<(), anyhow::Error> {"},{"Add":" let former = self.root.join(former);"},{"Add":" let new = self.root.join(new);"},{"Add":" if let Some(p) = new.parent() {"},{"Add":" std::fs::create_dir_all(p)?"},{"Add":" }"},{"Add":" if let Err(e) = std::fs::rename(&former, &new) {"},{"Add":" error!(\"while renaming {:?} to {:?}: {:?}\", former, new, e)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" #[cfg(not(windows))]"},{"Add":" fn set_permissions(&mut self, name: &str, permissions: u16) -> Result<(), anyhow::Error> {"},{"Add":" use std::os::unix::fs::PermissionsExt;"},{"Add":" let name = self.root.join(name);"},{"Add":" debug!(\"set_permissions: {:?}\", name);"},{"Add":" let metadata = std::fs::metadata(&name)?;"},{"Add":" let mut current = metadata.permissions();"},{"Add":" debug!("},{"Add":" \"setting mode for {:?} to {:?} (currently {:?})\","},{"Add":" name, permissions, current"},{"Add":" );"},{"Add":" current.set_mode(permissions as u32);"},{"Add":" std::fs::set_permissions(name, current)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" #[cfg(windows)]"},{"Add":" fn set_permissions(&mut self, _name: &str, _permissions: u16) -> Result<(), anyhow::Error> {"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" fn write_file Result>("},{"Add":" &mut self,"},{"Add":" file: &str,"},{"Add":" writer: F,"},{"Add":" ) -> Result {"},{"Add":" let path = self.root.join(file);"},{"Add":" if let Some(p) = path.parent() {"},{"Add":" std::fs::create_dir_all(p)?"},{"Add":" }"},{"Add":" std::fs::remove_file(&path).unwrap_or(());"},{"Add":" let mut file = std::io::BufWriter::new(std::fs::File::create(&path)?);"},{"Add":" writer(&mut file)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(not(windows))]"},{"Add":"fn permissions(attr: &std::fs::Metadata) -> Option {"},{"Add":" use std::os::unix::fs::PermissionsExt;"},{"Add":" Some(attr.permissions().mode() as usize)"},{"Add":"}"},{"Add":"#[cfg(windows)]"},{"Add":"fn permissions(_: &std::fs::Metadata) -> Option {"},{"Add":" None"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"vertex_buffer.rs","metadata":420},"context":[{"change":0,"pos":198146}],"contents":[{"Add":"// org id YHNNzZV5am1BYRE9P9yHBV54v3BJ2n5DcyZHps06YG4="},{"Add":"use crate::pristine::*;"},{"Add":""},{"Add":"pub const START_MARKER: &'static str = \"\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\n\";"},{"Add":""},{"Add":"pub const SEPARATOR: &'static str = \"\\n================================\\n\";"},{"Add":""},{"Add":"pub const END_MARKER: &'static str = \"\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\";"},{"Add":""},{"Add":"/// A trait for outputting keys and their contents. This trait allows"},{"Add":"/// to retain more information about conflicts than directly"},{"Add":"/// outputting as bytes to a `Write`. The diff algorithm uses that"},{"Add":"/// information, for example."},{"Add":"pub trait VertexBuffer {"},{"Add":" fn output_line) -> Result<(), anyhow::Error>>("},{"Add":" &mut self,"},{"Add":" key: Vertex,"},{"Add":" contents: F,"},{"Add":" ) -> Result<(), anyhow::Error>;"},{"Add":""},{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error>;"},{"Add":" fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.begin_conflict()"},{"Add":" }"},{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.begin_conflict()"},{"Add":" }"},{"Add":" fn conflict_next(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(SEPARATOR)"},{"Add":" }"},{"Add":" fn end_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(END_MARKER)"},{"Add":" }"},{"Add":" fn end_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(END_MARKER)"},{"Add":" }"},{"Add":" fn end_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(END_MARKER)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub(crate) struct ConflictsWriter<'a, 'b, W: std::io::Write> {"},{"Add":" pub w: W,"},{"Add":" pub lines: usize,"},{"Add":" pub new_line: bool,"},{"Add":" pub path: &'b str,"},{"Add":" pub conflicts: &'a mut Vec,"},{"Add":" pub buf: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, 'b, W: std::io::Write> ConflictsWriter<'a, 'b, W> {"},{"Add":" pub fn new(w: W, path: &'b str, conflicts: &'a mut Vec) -> Self {"},{"Add":" ConflictsWriter {"},{"Add":" w,"},{"Add":" new_line: true,"},{"Add":" lines: 1,"},{"Add":" path,"},{"Add":" conflicts,"},{"Add":" buf: Vec::new(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, 'b, W: std::io::Write> std::ops::Deref for ConflictsWriter<'a, 'b, W> {"},{"Add":" type Target = W;"},{"Add":" fn deref(&self) -> &Self::Target {"},{"Add":" &self.w"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, 'b, W: std::io::Write> std::ops::DerefMut for ConflictsWriter<'a, 'b, W> {"},{"Add":" fn deref_mut(&mut self) -> &mut Self::Target {"},{"Add":" &mut self.w"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, 'b, W: std::io::Write> VertexBuffer for ConflictsWriter<'a, 'b, W> {"},{"Add":" fn output_line) -> Result<(), anyhow::Error>>("},{"Add":" &mut self,"},{"Add":" _: Vertex,"},{"Add":" c: C,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.buf.clear();"},{"Add":" c(&mut self.buf)?;"},{"Add":" let ends_with_newline = self.buf.ends_with(b\"\\n\");"},{"Add":" self.lines += self.buf.iter().filter(|c| **c == b'\\n').count();"},{"Add":" self.w.write_all(&self.buf)?;"},{"Add":" if !self.buf.is_empty() {"},{"Add":" // empty \"lines\" (such as in the beginning of a file)"},{"Add":" // don't change the status of self.new_line."},{"Add":" self.new_line = ends_with_newline;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"output_conflict_marker {:?}\", self.new_line);"},{"Add":" if !self.new_line {"},{"Add":" self.lines += 2;"},{"Add":" self.w.write(s.as_bytes())?;"},{"Add":" } else {"},{"Add":" self.lines += 1;"},{"Add":" debug!(\"{:?}\", &s.as_bytes()[1..]);"},{"Add":" self.w.write(&s.as_bytes()[1..])?;"},{"Add":" }"},{"Add":" self.new_line = true;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.conflicts.push(crate::output::Conflict::Order {"},{"Add":" path: self.path.to_string(),"},{"Add":" line: self.lines,"},{"Add":" });"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.conflicts.push(crate::output::Conflict::Zombie {"},{"Add":" path: self.path.to_string(),"},{"Add":" line: self.lines,"},{"Add":" });"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.conflicts.push(crate::output::Conflict::Cyclic {"},{"Add":" path: self.path.to_string(),"},{"Add":" line: self.lines,"},{"Add":" });"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct Writer {"},{"Add":" w: W,"},{"Add":" buf: Vec,"},{"Add":" new_line: bool,"},{"Add":"}"},{"Add":""},{"Add":"impl Writer {"},{"Add":" pub fn new(w: W) -> Self {"},{"Add":" Writer {"},{"Add":" w,"},{"Add":" new_line: true,"},{"Add":" buf: Vec::new(),"},{"Add":" }"},{"Add":" }"},{"Add":" pub fn into_inner(self) -> W {"},{"Add":" self.w"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::Deref for Writer {"},{"Add":" type Target = W;"},{"Add":" fn deref(&self) -> &Self::Target {"},{"Add":" &self.w"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::DerefMut for Writer {"},{"Add":" fn deref_mut(&mut self) -> &mut Self::Target {"},{"Add":" &mut self.w"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl VertexBuffer for Writer {"},{"Add":" fn output_line) -> Result<(), anyhow::Error>>("},{"Add":" &mut self,"},{"Add":" _: Vertex,"},{"Add":" c: C,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" self.buf.clear();"},{"Add":" c(&mut self.buf)?;"},{"Add":" let ends_with_newline = self.buf.ends_with(b\"\\n\");"},{"Add":" self.w.write_all(&self.buf[..])?;"},{"Add":" if !self.buf.is_empty() {"},{"Add":" // empty \"lines\" (such as in the beginning of a file)"},{"Add":" // don't change the status of self.new_line."},{"Add":" self.new_line = ends_with_newline;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn output_conflict_marker(&mut self, s: &str) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"output_conflict_marker {:?}\", self.new_line);"},{"Add":" if !self.new_line {"},{"Add":" self.w.write(s.as_bytes())?;"},{"Add":" } else {"},{"Add":" debug!(\"{:?}\", &s.as_bytes()[1..]);"},{"Add":" self.w.write(&s.as_bytes()[1..])?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn begin_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":" fn begin_zombie_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":" fn begin_cyclic_conflict(&mut self) -> Result<(), anyhow::Error> {"},{"Add":" self.output_conflict_marker(START_MARKER)"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"vector2.rs","metadata":420},"context":[{"change":0,"pos":198146}],"contents":[{"Add":"// org id zbhEFFLH9dRwVwwwwfF92Y0wFF4fPrXmDJAX4GwqE9A="},{"Add":"pub(crate) struct Vector2 {"},{"Add":" v: Vec ,"},{"Add":" bounds: Vec,"},{"Add":"}"},{"Add":""},{"Add":"impl Vector2 {"},{"Add":" pub(crate) fn new() -> Self {"},{"Add":" Vector2 {"},{"Add":" v: Vec::new(),"},{"Add":" bounds: vec![0],"},{"Add":" }"},{"Add":" }"},{"Add":" pub(crate) fn len(&self) -> usize {"},{"Add":" self.bounds.len() - 1"},{"Add":" }"},{"Add":" pub(crate) fn with_capacities(total: usize, n: usize) -> Self {"},{"Add":" let mut bounds = Vec::with_capacity(n);"},{"Add":" bounds.push(0);"},{"Add":" Vector2 {"},{"Add":" v: Vec::with_capacity(total),"},{"Add":" bounds,"},{"Add":" }"},{"Add":" }"},{"Add":" pub(crate) fn push_to_last(&mut self, a: A) {"},{"Add":" assert!(self.bounds.len() > 1);"},{"Add":" *self.bounds.last_mut().unwrap() += 1;"},{"Add":" self.v.push(a)"},{"Add":" }"},{"Add":" pub(crate) fn push(&mut self) {"},{"Add":" self.bounds.push(self.v.len())"},{"Add":" }"},{"Add":" pub(crate) fn last_mut(&mut self) -> Option<&mut [A]> {"},{"Add":" if self.bounds.len() >= 2 {"},{"Add":" let i = self.bounds.len() - 2;"},{"Add":" Some(&mut self.v[self.bounds[i]..self.bounds[i + 1]])"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::Index for Vector2 {"},{"Add":" type Output = [A];"},{"Add":" fn index(&self, i: usize) -> &[A] {"},{"Add":" &self.v[self.bounds[i]..self.bounds[i + 1]]"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::IndexMut for Vector2 {"},{"Add":" fn index_mut(&mut self, i: usize) -> &mut [A] {"},{"Add":" &mut self.v[self.bounds[i]..self.bounds[i + 1]]"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Debug for Vector2 {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!(fmt, \"[\")?;"},{"Add":" for i in 0..self.bounds.len() - 1 {"},{"Add":" if i > 0 {"},{"Add":" write!(fmt, \", \")?"},{"Add":" }"},{"Add":" write!(fmt, \"{:?}\", &self[i])?"},{"Add":" }"},{"Add":" write!(fmt, \"]\")?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn test_v2() {"},{"Add":" let mut v: Vector2 = Vector2::new();"},{"Add":" v.push();"},{"Add":" v.push_to_last(0);"},{"Add":" v.push_to_last(1);"},{"Add":" v.push_to_last(2);"},{"Add":" v.push();"},{"Add":" v.push_to_last(4);"},{"Add":" v.push_to_last(5);"},{"Add":" v.push_to_last(6);"},{"Add":" assert_eq!(&v[0], &[0, 1, 2][..]);"},{"Add":" assert_eq!(&v[1], &[4, 5, 6][..]);"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"#[should_panic]"},{"Add":"fn test_v2_() {"},{"Add":" let w: Vector2 = Vector2::new();"},{"Add":" println!(\"{:?}\", &w[0]);"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"unrecord","metadata":1005},"context":[{"change":0,"pos":198146}],"contents":[]}},{"FileAdd":{"meta":{"basename":"working_copy.rs","metadata":420},"context":[{"change":0,"pos":225921}],"contents":[{"Add":"// org id hPrt74aGC9MoSCkacm35YMV1UsqOTCIc9O8ApjoChHI="},{"Add":"use crate::change::*;"},{"Add":"use crate::changestore::*;"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::small_string::*;"},{"Add":"// org id XWsbPEqsD3paeM/LxVDyIr2Q565JHhSez0T72hx9cHs="},{"Add":"pub fn undo_file_addition("},{"Add":" txn: &mut T,"},{"Add":" change_id: ChangeId,"},{"Add":" new_vertex: &NewVertex>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" if new_vertex.start == new_vertex.end {"},{"Add":" let pos = Position {"},{"Add":" change: change_id,"},{"Add":" pos: new_vertex.start,"},{"Add":" };"},{"Add":" if let Some(inode) = txn.get_revinodes(pos, None) {"},{"Add":" let inode = inode.to_owned();"},{"Add":" txn.del_revinodes(pos, None)?;"},{"Add":" txn.del_inodes(inode, None)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id aM0a1a29Y251MOlVfR8GafvillHOtUZNFlHypSf5e0c="},{"Add":"pub fn undo_file_deletion("},{"Add":" txn: &mut T,"},{"Add":" changes: &P,"},{"Add":" channel: &Channel,"},{"Add":" change_id: ChangeId,"},{"Add":" newedges: &EdgeMap>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" for e in newedges.edges.iter().rev() {"},{"Add":" assert!(!e.flag.contains(EdgeFlags::PARENT));"},{"Add":" let source = txn.find_block_end(&channel, txn.internal_pos(&e.from, change_id)?)?;"},{"Add":" if e.flag.contains(EdgeFlags::FOLDER) && e.to.start_pos() == e.to.end_pos() {"},{"Add":" let dest = txn.internal_pos(&e.to.start_pos(), change_id)?;"},{"Add":" restore(txn, changes, channel, source, dest)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id jpnOhTUKi2/wrb/uh1iJyGyO0F8zmYxoJlnFRItxZo0="},{"Add":"fn restore("},{"Add":" txn: &mut T,"},{"Add":" changes: &P,"},{"Add":" channel: &Channel,"},{"Add":" source: Vertex,"},{"Add":" dest: Position,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let mut stack = vec![(source, dest)];"},{"Add":" let mut return_value = None;"},{"Add":" while let Some((source, dest)) = stack.pop() {"},{"Add":" if let Some(parent_inode) = return_value {"},{"Add":" return_value = Some(restore_inode(txn, changes, source, dest, parent_inode)?);"},{"Add":" continue;"},{"Add":" }"},{"Add":" let source_parent = txn"},{"Add":" .iter_adjacent("},{"Add":" &channel,"},{"Add":" source,"},{"Add":" EdgeFlags::PARENT | EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::all(),"},{"Add":" )"},{"Add":" .filter(|e| e.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER))"},{"Add":" .next()"},{"Add":" .unwrap()"},{"Add":" .dest;"},{"Add":" // org id tgKUYrZqx9aEX8jZs1AQbH/VCnJJAtXyCdfty6XGk3I="},{"Add":" if source_parent.change.is_root() {"},{"Add":" return_value = Some(restore_inode(txn, changes, source, dest, Inode::ROOT)?)"},{"Add":" } else if let Some(inode) = txn.get_revinodes(source_parent, None) {"},{"Add":" return_value = Some(restore_inode(txn, changes, source, dest, inode)?)"},{"Add":" } else {"},{"Add":" let grandparent = find_youngest_parent(txn, channel, source_parent.inode_vertex())?;"},{"Add":" stack.push((source, dest));"},{"Add":" stack.push((grandparent, source_parent));"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id 6G9wZJSePFPM3jnKlWo/js7upKaYQwFWH9ep4l2BR8Y="},{"Add":"fn restore_inode("},{"Add":" txn: &mut T,"},{"Add":" changes: &P,"},{"Add":" source: Vertex,"},{"Add":" dest: Position,"},{"Add":" parent_inode: Inode,"},{"Add":") -> Result {"},{"Add":" let inode = crate::fs::create_new_inode(txn);"},{"Add":" let mut name = Vec::new();"},{"Add":" let (_, basename) = changes.get_file_name(|h| txn.get_external(h), source, &mut name)?;"},{"Add":" let basename = SmallString::from_str(basename);"},{"Add":" let file_id = OwnedPathId {"},{"Add":" parent_inode,"},{"Add":" basename,"},{"Add":" };"},{"Add":" txn.put_tree(file_id.as_file_id(), inode)?;"},{"Add":" txn.put_revtree(inode, file_id.as_file_id())?;"},{"Add":" txn.replace_inodes(inode, dest)?;"},{"Add":" txn.replace_revinodes(dest, inode)?;"},{"Add":" Ok(inode)"},{"Add":"}"},{"Add":"// org id RM0rj9DnLmh6LYZN5VK6ADMYoieH0mZJcaFzBEZzf9c="},{"Add":"fn find_youngest_parent("},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" current: Vertex,"},{"Add":") -> Result, crate::Error> {"},{"Add":" let mut next = None;"},{"Add":" for e in txn"},{"Add":" .iter_adjacent("},{"Add":" channel,"},{"Add":" current,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT | EdgeFlags::DELETED | EdgeFlags::BLOCK,"},{"Add":" )"},{"Add":" .filter(|e| e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT))"},{"Add":" {"},{"Add":" if e.flag.contains(EdgeFlags::DELETED) {"},{"Add":" let age = txn"},{"Add":" .get_changeset(&channel.changes, e.introduced_by, None)"},{"Add":" .unwrap();"},{"Add":" if let Some((ref mut age0, ref mut v)) = next {"},{"Add":" if age > *age0 {"},{"Add":" *age0 = age;"},{"Add":" *v = e.dest"},{"Add":" }"},{"Add":" } else {"},{"Add":" next = Some((age, e.dest))"},{"Add":" }"},{"Add":" } else {"},{"Add":" next = Some((0, e.dest));"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" txn.find_block_end(channel, next.unwrap().1)"},{"Add":"}"},{"Add":""},{"Add":"// org id T313j+8glo3jbLVV755vMhVhm9EW2lx+7wowRud9Bfo="},{"Add":"pub fn undo_file_reinsertion("},{"Add":" txn: &mut T,"},{"Add":" change_id: ChangeId,"},{"Add":" newedges: &EdgeMap>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" for e in newedges.edges.iter() {"},{"Add":" assert!(!e.flag.contains(EdgeFlags::PARENT));"},{"Add":" // org id HBoHMB0n95+Pap0r6KHw3Kj1HRX0MyKXyd0dYieT2cs="},{"Add":" if e.to.start_pos() == e.to.end_pos() {"},{"Add":" let position = txn.internal_pos(&e.to.start_pos(), change_id)?;"},{"Add":" if let Some(inode) = txn.get_revinodes(position, None) {"},{"Add":" let inode = inode.to_owned();"},{"Add":" txn.del_revinodes(position, None)?;"},{"Add":" txn.del_inodes(inode, None)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"mod.rs","metadata":420},"context":[{"change":0,"pos":225921}],"contents":[{"Add":"// org id IuiCX9taX7EZv/Aqz/UZc5r7v/fH7MJn3/QIj46oHwc="},{"Add":"use crate::apply;"},{"Add":"use crate::change::*;"},{"Add":"use crate::changestore::*;"},{"Add":"use crate::missing_context::*;"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::Error;"},{"Add":""},{"Add":"use std::collections::{HashMap, HashSet};"},{"Add":""},{"Add":"mod working_copy;"},{"Add":""},{"Add":"pub fn unrecord("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" changes: &P,"},{"Add":" hash: &Hash,"},{"Add":") -> Result {"},{"Add":" let change = changes.get_change(hash)?;"},{"Add":" let change_id = if let Some(h) = txn.get_internal(*hash) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" return Ok(false);"},{"Add":" };"},{"Add":" let unused = unused_in_other_channels(txn, &channel, change_id);"},{"Add":" let mut channel = channel.r.borrow_mut();"},{"Add":""},{"Add":" del_channel_changes(txn, &mut channel, change_id)?;"},{"Add":""},{"Add":" unapply(txn, &mut channel, changes, change_id, &change)?;"},{"Add":""},{"Add":" if unused {"},{"Add":" assert!(txn.get_revdep(change_id, None).is_none());"},{"Add":" while txn.del_dep(change_id, None)? {}"},{"Add":" txn.del_external(change_id, None)?;"},{"Add":" txn.del_internal(*hash, None)?;"},{"Add":" for dep in change.dependencies.iter() {"},{"Add":" let dep = txn.get_internal(*dep).unwrap();"},{"Add":" txn.del_revdep(dep, Some(change_id))?;"},{"Add":" }"},{"Add":" Ok(false)"},{"Add":" } else {"},{"Add":" Ok(true)"},{"Add":" }"},{"Add":"}"},{"Add":"// org id 4kyMdTywL4dWm7Vw3kXLcabNNGbFzSP3FTUptNMLPwg="},{"Add":"fn del_channel_changes("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" change_id: ChangeId,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let timestamp = if let Some(ts) = txn.get_changeset(&channel.changes, change_id, None) {"},{"Add":" ts"},{"Add":" } else {"},{"Add":" return Err((Error::ChangeNotOnChannel { change_id }).into());"},{"Add":" };"},{"Add":""},{"Add":" for (p, d) in txn.iter_revdep(change_id) {"},{"Add":" if p < change_id {"},{"Add":" continue;"},{"Add":" } else if p > change_id {"},{"Add":" break;"},{"Add":" }"},{"Add":" if txn.get_changeset(&channel.changes, d, None).is_some() {"},{"Add":" return Err((Error::ChangeIsDependedUpon { change_id }).into());"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" txn.del_changes(channel, change_id, timestamp)?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id F70s1W/0AmTkJZfg47g3+OXxINmwCgXU7G5j5QZkvh8="},{"Add":"fn unused_in_other_channels("},{"Add":" txn: &mut T,"},{"Add":" channel: &ChannelRef,"},{"Add":" change_id: ChangeId,"},{"Add":") -> bool {"},{"Add":" let channel = channel.borrow();"},{"Add":" for br in txn.iter_channels(\"\") {"},{"Add":" let br = br.borrow();"},{"Add":" if br.name != channel.name {"},{"Add":" if txn.get_changeset(&br.changes, change_id, None).is_some() {"},{"Add":" return false;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" true"},{"Add":"}"},{"Add":"// org id UmzPcrZozUPTljK9LrlZa2FIXJwwvHpPmfRQ9uV4qTs="},{"Add":"fn unapply("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" changes: &C,"},{"Add":" change_id: ChangeId,"},{"Add":" change: &Change,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let mut clean_inodes = HashSet::new();"},{"Add":" let mut ws = Workspace::new();"},{"Add":" for change_ in change.changes.iter().rev().flat_map(|r| r.rev_iter()) {"},{"Add":" match *change_ {"},{"Add":" Atom::EdgeMap(ref newedges) => {"},{"Add":" unapply_edges(changes, txn, channel, change_id, newedges, &mut ws)?"},{"Add":" }"},{"Add":" Atom::NewVertex(ref newvertex) => {"},{"Add":" if clean_inodes.insert(newvertex.inode) {"},{"Add":" crate::alive::remove_forward_edges("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" txn.internal_pos(&newvertex.inode, change_id)?,"},{"Add":" )?;"},{"Add":" }"},{"Add":" unapply_newvertex(txn, channel, change_id, &mut ws, newvertex)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" repair_newvertex_contexts(txn, channel, &mut ws)?;"},{"Add":" // org id zX78t6A+99OopoXmY9luuPGgXMHwzPEPT8sYitaxNyc="},{"Add":" for change in change.changes.iter().rev().flat_map(|r| r.rev_iter()) {"},{"Add":" match *change {"},{"Add":" Atom::EdgeMap(ref n) => {"},{"Add":" remove_zombies(txn, channel, change_id, n)?;"},{"Add":" repair_edges_context("},{"Add":" changes,"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.apply.missing_context,"},{"Add":" change_id,"},{"Add":" n,"},{"Add":" )?"},{"Add":" }"},{"Add":" _ => {}"},{"Add":" }"},{"Add":" }"},{"Add":" crate::apply::clean_obsolete_pseudo_edges(txn, channel, &mut ws.apply)?;"},{"Add":" channel.last_modified = 0;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id ysIZl8M4RTRZyISrNO1VOKOsKxkQsZFux9RvLLl192Y="},{"Add":""},{"Add":"struct Workspace {"},{"Add":" up: HashMap, Position>>,"},{"Add":" down: HashMap, (Position>, bool)>,"},{"Add":" del: Vec,"},{"Add":" apply: crate::apply::Workspace,"},{"Add":"}"},{"Add":""},{"Add":"impl Workspace {"},{"Add":" fn new() -> Self {"},{"Add":" Workspace {"},{"Add":" up: HashMap::new(),"},{"Add":" down: HashMap::new(),"},{"Add":" del: Vec::new(),"},{"Add":" apply: crate::apply::Workspace::new(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn unapply_newvertex("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" change_id: ChangeId,"},{"Add":" ws: &mut Workspace,"},{"Add":" new_vertex: &NewVertex>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let mut pos = Position {"},{"Add":" change: change_id,"},{"Add":" pos: new_vertex.start,"},{"Add":" };"},{"Add":" debug!(\"unapply_newvertex = {:?}\", new_vertex);"},{"Add":" while pos.pos <= new_vertex.end {"},{"Add":" debug!(\"pos = {:?}\", pos);"},{"Add":" let vertex = if let Ok(v) = txn.find_block(channel, pos) {"},{"Add":" v"},{"Add":" } else {"},{"Add":" // This means that the only edges to this block were"},{"Add":" // removed from the graph, which can only happen if this"},{"Add":" // block is the bottommost vertex in the graph."},{"Add":" if cfg!(debug_assertions) {"},{"Add":" while pos.pos <= new_vertex.end {"},{"Add":" assert!(txn.find_block(channel, pos).is_err());"},{"Add":" pos.pos = pos.pos + 1;"},{"Add":" }"},{"Add":" }"},{"Add":" break;"},{"Add":" };"},{"Add":" debug!(\"vertex = {:?}\", vertex);"},{"Add":" for e in txn.iter_adjacent(channel, vertex, EdgeFlags::empty(), EdgeFlags::all()) {"},{"Add":" debug!(\"e = {:?}\", e);"},{"Add":" if !e.flag.contains(EdgeFlags::DELETED) {"},{"Add":" if e.flag.contains(EdgeFlags::PARENT) {"},{"Add":" if !e.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" let up_v = txn.find_block_end(channel, e.dest)?;"},{"Add":" ws.up.insert(up_v, new_vertex.inode);"},{"Add":" }"},{"Add":" } else {"},{"Add":" let down_v = txn.find_block(channel, e.dest)?;"},{"Add":" ws.down.insert("},{"Add":" down_v,"},{"Add":" (new_vertex.inode, e.flag.contains(EdgeFlags::FOLDER)),"},{"Add":" );"},{"Add":" }"},{"Add":" }"},{"Add":" ws.del.push(e)"},{"Add":" }"},{"Add":" debug!(\"del = {:#?}\", ws.del);"},{"Add":" ws.up.remove(&vertex);"},{"Add":" ws.down.remove(&vertex);"},{"Add":""},{"Add":" // Delete all in `del`."},{"Add":" for e in ws.del.drain(..) {"},{"Add":" let (a, b) = if e.flag.contains(EdgeFlags::PARENT) {"},{"Add":" (txn.find_block_end(channel, e.dest)?, vertex)"},{"Add":" } else {"},{"Add":" (vertex, txn.find_block(channel, e.dest)?)"},{"Add":" };"},{"Add":" txn.del_graph_with_rev(channel, e.flag - EdgeFlags::PARENT, a, b, e.introduced_by)?;"},{"Add":" }"},{"Add":""},{"Add":" // Move on to the next split of ~new_vertex~."},{"Add":" pos.pos = vertex.end"},{"Add":" }"},{"Add":""},{"Add":" if new_vertex.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" if new_vertex.down_context.is_empty() {"},{"Add":" // let mut f = std::fs::File::create(\"debug_unrecord\")?;"},{"Add":" // txn.debug(&channel, &mut f).unwrap();"},{"Add":""},{"Add":" working_copy::undo_file_addition(txn, change_id, new_vertex)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn repair_newvertex_contexts("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut Workspace,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"up = {:#?}\", ws.up);"},{"Add":" for (up, inode) in ws.up.drain() {"},{"Add":" if txn.is_alive(channel, up) {"},{"Add":" crate::missing_context::repair_missing_down_context("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.apply.missing_context,"},{"Add":" inode,"},{"Add":" up,"},{"Add":" &[up],"},{"Add":" )?"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"down = {:#?}\", ws.down);"},{"Add":" let mut parents = HashSet::new();"},{"Add":" for (down, (inode, is_folder)) in ws.down.drain() {"},{"Add":" for parent in txn.iter_adjacent("},{"Add":" channel,"},{"Add":" down,"},{"Add":" EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED,"},{"Add":" ) {"},{"Add":" let parent = txn.find_block_end(channel, parent.dest)?;"},{"Add":" if !txn.is_alive(channel, parent) {"},{"Add":" parents.insert(parent);"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"parents {:#?}\", parents);"},{"Add":" for up in parents.drain() {"},{"Add":" crate::missing_context::repair_missing_up_context("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.apply.missing_context,"},{"Add":" inode,"},{"Add":" up,"},{"Add":" &[down],"},{"Add":" is_folder,"},{"Add":" )?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id TtkPh63N/jM5q98a/9yDp97cHPAUzouetXVib5fpVnY="},{"Add":"fn unapply_edges("},{"Add":" changes: &P,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" change_id: ChangeId,"},{"Add":" newedges: &EdgeMap>,"},{"Add":" ws: &mut Workspace,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"newedges = {:#?}\", newedges);"},{"Add":" let ext = txn.get_external(change_id).unwrap();"},{"Add":" let mut f = |h, from, to, flag| changes.has_edge(h, from, to, flag);"},{"Add":" for edge in newedges.edges.iter() {"},{"Add":" // This is ok: since this change is applied, this can't fail."},{"Add":" let int = txn.internal(&edge.introduced_by, change_id).unwrap();"},{"Add":" apply::put_newedge("},{"Add":" &mut f,"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.apply,"},{"Add":" int,"},{"Add":" newedges.inode,"},{"Add":" &NewEdge {"},{"Add":" previous: edge.flag,"},{"Add":" flag: edge.previous,"},{"Add":" from: edge.from,"},{"Add":" to: edge.to,"},{"Add":" introduced_by: Some(ext),"},{"Add":" },"},{"Add":" |txn, channel, a, b| {"},{"Add":" must_reintroduce("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" changes,"},{"Add":" a,"},{"Add":" b,"},{"Add":" edge.introduced_by.unwrap(),"},{"Add":" int,"},{"Add":" )"},{"Add":" },"},{"Add":" )?;"},{"Add":" }"},{"Add":""},{"Add":" if newedges.edges[0].flag.contains(EdgeFlags::FOLDER) {"},{"Add":" if newedges.edges[0].flag.contains(EdgeFlags::DELETED) {"},{"Add":" working_copy::undo_file_deletion(txn, changes, channel, change_id, newedges)?"},{"Add":" } else {"},{"Add":" working_copy::undo_file_reinsertion(txn, change_id, newedges)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn must_reintroduce("},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" changes: &C,"},{"Add":" a: Vertex,"},{"Add":" b: Vertex,"},{"Add":" intro: Hash,"},{"Add":" intro_id: ChangeId,"},{"Add":") -> Result {"},{"Add":" debug!(\"a = {:?}, b = {:?}\", a, b);"},{"Add":" // does a patch introduced by an edge parallel to"},{"Add":" // this one remove this edge from the graph?"},{"Add":" let b_ext = Position {"},{"Add":" change: txn.get_external(b.change),"},{"Add":" pos: b.start,"},{"Add":" };"},{"Add":" let mut stack = Vec::new();"},{"Add":" for e in txn"},{"Add":" .iter_adjacent(channel, a, EdgeFlags::empty(), EdgeFlags::all())"},{"Add":" .filter(|e| {"},{"Add":" !e.flag.contains(EdgeFlags::PARENT)"},{"Add":" && e.dest == b.start_pos()"},{"Add":" && !e.introduced_by.is_root()"},{"Add":" })"},{"Add":" {"},{"Add":" // Optimisation to avoid opening change files"},{"Add":" // in the vast majority of cases: if there is"},{"Add":" // an edge `e` parallel to a -> b introduced"},{"Add":" // by the change that introduced a or b, don't"},{"Add":" // reinsert a -> b: that edge was removed by"},{"Add":" // `e`."},{"Add":" if !cfg!(debug_assertions) && (a.change == intro_id || b.change == intro_id) {"},{"Add":" return Ok(false);"},{"Add":" }"},{"Add":" stack.push(e.introduced_by)"},{"Add":" }"},{"Add":" edge_is_in_channel(txn, changes, b_ext, intro, &mut stack)"},{"Add":"}"},{"Add":""},{"Add":"fn edge_is_in_channel("},{"Add":" txn: &T,"},{"Add":" changes: &C,"},{"Add":" pos: Position>,"},{"Add":" introduced_by: Hash,"},{"Add":" stack: &mut Vec,"},{"Add":") -> Result {"},{"Add":" let mut visited = HashSet::new();"},{"Add":" while let Some(s) = stack.pop() {"},{"Add":" if !visited.insert(s) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" debug!(\"stack: {:?}\", s);"},{"Add":" for next in changes.change_deletes_position(|c| txn.get_external(c), s, pos)? {"},{"Add":" if next == introduced_by {"},{"Add":" return Ok(false);"},{"Add":" } else if let Some(i) = txn.get_internal(next) {"},{"Add":" stack.push(i)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(true)"},{"Add":"}"},{"Add":""},{"Add":"fn remove_zombies("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" change_id: ChangeId,"},{"Add":" newedges: &EdgeMap>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let mut del = Vec::new();"},{"Add":" let mut stack = vec![];"},{"Add":" let mut visited = HashSet::new();"},{"Add":" debug!(\"remove_zombies, change_id = {:?}\", change_id);"},{"Add":" for edge in newedges.edges.iter() {"},{"Add":" // Remove zombies caused by this EdgeMap."},{"Add":" let to = txn.internal_pos(&edge.to.start_pos(), change_id)?;"},{"Add":" stack.push(txn.find_block(channel, to)?);"},{"Add":" visited.clear();"},{"Add":" while let Some(v) = stack.pop() {"},{"Add":" debug!(\"remove_zombies, v = {:?}\", v);"},{"Add":" if !visited.insert(v) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" for e in txn.iter_adjacent(channel, v, EdgeFlags::empty(), EdgeFlags::all()) {"},{"Add":" debug!(\"e = {:?}\", e);"},{"Add":" // If the edge is a parent-non-block edge, go up."},{"Add":" let mut follow ="},{"Add":" e.flag.contains(EdgeFlags::DELETED) && e.introduced_by != change_id;"},{"Add":" follow |= e.flag & (EdgeFlags::BLOCK | EdgeFlags::PARENT) == EdgeFlags::PARENT;"},{"Add":""},{"Add":" if !follow {"},{"Add":" if e.introduced_by != change_id {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" if e.flag.contains(EdgeFlags::PARENT) {"},{"Add":" stack.push(txn.find_block_end(channel, e.dest)?)"},{"Add":" } else {"},{"Add":" stack.push(txn.find_block(channel, e.dest)?)"},{"Add":" }"},{"Add":" if e.introduced_by == change_id {"},{"Add":" del.push((v, e))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"remove_zombies = {:#?}\", del);"},{"Add":" for (v, e) in del.drain(..) {"},{"Add":" if e.flag.contains(EdgeFlags::PARENT) {"},{"Add":" let u = txn.find_block_end(channel, e.dest)?;"},{"Add":" txn.del_graph_with_rev(channel, e.flag - EdgeFlags::PARENT, u, v, e.introduced_by)?;"},{"Add":" if txn"},{"Add":" .iter_adjacent("},{"Add":" channel,"},{"Add":" u,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED - EdgeFlags::PARENT,"},{"Add":" )"},{"Add":" .filter(|e| e.dest == v.start_pos())"},{"Add":" .next()"},{"Add":" .is_none()"},{"Add":" {"},{"Add":" let f = if e.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" EdgeFlags::FOLDER"},{"Add":" } else {"},{"Add":" EdgeFlags::empty()"},{"Add":" };"},{"Add":" txn.put_graph_with_rev(channel, f, u, v, u.change)?;"},{"Add":" }"},{"Add":" } else {"},{"Add":" let w = txn.find_block(channel, e.dest)?;"},{"Add":" txn.del_graph_with_rev(channel, e.flag, v, w, e.introduced_by)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// org id 4dFFHO4v8n5FooqRmC0cyb1+9EjtjPMqW7wdJCUIRsU="},{"Add":"fn repair_edges_context("},{"Add":" changes: &P,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut crate::missing_context::Workspace,"},{"Add":" change_id: ChangeId,"},{"Add":" n: &EdgeMap>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let change_hash = txn.get_external(change_id).unwrap();"},{"Add":" for e in n.edges.iter() {"},{"Add":" assert!(!e.flag.contains(EdgeFlags::PARENT));"},{"Add":" if e.previous.contains(EdgeFlags::DELETED) {"},{"Add":" let e = NewEdge {"},{"Add":" previous: e.flag,"},{"Add":" flag: e.previous,"},{"Add":" from: e.from,"},{"Add":" to: e.to,"},{"Add":" introduced_by: Some(change_hash),"},{"Add":" };"},{"Add":" let intro = txn.internal(&e.introduced_by, change_id).unwrap();"},{"Add":" let intro_ext = e.introduced_by.unwrap_or(change_hash);"},{"Add":" repair_context_deleted("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" ws,"},{"Add":" n.inode,"},{"Add":" intro,"},{"Add":" |h| changes.knows(&intro_ext, &h).unwrap(),"},{"Add":" &e,"},{"Add":" )?"},{"Add":" } else {"},{"Add":" let intro = txn.internal(&e.introduced_by, change_id).unwrap();"},{"Add":" let intro_ext = e.introduced_by.unwrap_or(change_hash);"},{"Add":" let to = txn.internal_pos(&e.to.start_pos(), change_id)?;"},{"Add":" let to = txn.find_block(channel, to)?;"},{"Add":" if !txn.is_alive(channel, to) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" repair_context_nondeleted("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" ws,"},{"Add":" n.inode,"},{"Add":" intro,"},{"Add":" |h| changes.knows(&intro_ext, &h).unwrap(),"},{"Add":" &NewEdge {"},{"Add":" previous: e.flag,"},{"Add":" flag: e.previous,"},{"Add":" from: e.from,"},{"Add":" to: e.to,"},{"Add":" introduced_by: Some(change_hash),"},{"Add":" },"},{"Add":" )?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"tests","metadata":1005},"context":[{"change":0,"pos":198146}],"contents":[]}},{"FileAdd":{"meta":{"basename":"unrecord.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"use super::*;"},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"/// Add a file, write to it, then fork the branch and unrecord once on"},{"Add":"/// one side."},{"Add":"#[test]"},{"Add":"fn test() -> 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":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\")?;"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let _h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nx\\nb\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" let channel2 = txn.fork(&channel, \"main2\")?;"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"dir/file\", &mut buf)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), Ok(\"a\\nb\\nc\\nd\\n\"));"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un\")?;"},{"Add":" txn.debug_to_file(&channel2, \"debug_un2\")?;"},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn replace() -> 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":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\")?;"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let _h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nx\\ny\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" let channel2 = txn.fork(&channel, \"main2\")?;"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"dir/file\", &mut buf)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), Ok(\"a\\nb\\nc\\nd\\n\"));"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un\")?;"},{"Add":" txn.debug_to_file(&channel2, \"debug_un2\")?;"},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn file_move() -> 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":" repo.add_file(\"file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"file\")?;"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let _h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.rename(\"file\", \"dir/file\")?;"},{"Add":" txn.move_file(\"file\", \"dir/file\")?;"},{"Add":" debug!(\"recording the move\");"},{"Add":" let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un\")?;"},{"Add":" debug!(\"unrecording the move\");"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un2\")?;"},{"Add":" assert_eq!("},{"Add":" crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect::>(),"},{"Add":" vec![\"dir\", \"dir/file\"]"},{"Add":" );"},{"Add":" assert_eq!(repo.list_files(), vec![\"dir\", \"dir/file\"]);"},{"Add":""},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;"},{"Add":" assert_eq!("},{"Add":" crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect::>(),"},{"Add":" vec![\"file\"]"},{"Add":" );"},{"Add":" assert_eq!(repo.list_files(), vec![\"file\"]);"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn reconnect_lines() -> Result<(), anyhow::Error> {"},{"Add":" reconnect_(false)"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn reconnect_files() -> Result<(), anyhow::Error> {"},{"Add":" reconnect_(true)"},{"Add":"}"},{"Add":""},{"Add":"fn reconnect_(delete_file: bool) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let mut repo2 = working_copy::memory::Memory::new();"},{"Add":" let mut repo3 = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let env3 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" let mut txn3 = env3.mut_txn_begin();"},{"Add":" txn.add_file(\"file\")?;"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" let mut channel2 = txn2.open_or_create_channel(\"main\")?;"},{"Add":" let mut channel3 = txn3.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel2, h0)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true)?;"},{"Add":" apply::apply_change(&changes, &mut txn3, &mut channel3, h0)?;"},{"Add":" output::output_repository_no_pending(&mut repo3, &changes, &mut txn3, &mut channel3, \"\", true)?;"},{"Add":""},{"Add":" // This test removes a line (in h1), then replaces it with another"},{"Add":" // one (in h2), removes the pseudo-edges (output, below), and then"},{"Add":" // unrecords h2 to delete the connection. Test: do the"},{"Add":" // pseudo-edges reappear?"},{"Add":""},{"Add":" ///////////"},{"Add":" if delete_file {"},{"Add":" repo.remove_path(\"file\")?;"},{"Add":" } else {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" }"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" ///////////"},{"Add":" repo2.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nx\\nc\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h2 = record_all(&mut repo2, &changes, &mut txn2, &mut channel2, \"\")?;"},{"Add":""},{"Add":" repo2.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nx\\nc\\ny\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h3 = record_all(&mut repo2, &changes, &mut txn2, &mut channel2, \"\")?;"},{"Add":""},{"Add":" ///////////"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, h3)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un\")?;"},{"Add":""},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un2\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn zombie_file_test() -> Result<(), anyhow::Error> {"},{"Add":" zombie_(None)"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn zombie_lines_test() -> Result<(), anyhow::Error> {"},{"Add":" zombie_(Some(b\"d\\n\"))"},{"Add":"}"},{"Add":""},{"Add":"fn zombie_(file: Option<&[u8]>) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let mut repo2 = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" txn.add_file(\"file\")?;"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" let mut channel2 = txn2.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel2, h0)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &changes, &mut txn2, &mut channel2, \"\", true)?;"},{"Add":""},{"Add":" ///////////"},{"Add":" if let Some(file) = file {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(file)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" } else {"},{"Add":" repo.remove_path(\"file\")?;"},{"Add":" }"},{"Add":" let h1 = record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug_a\")?;"},{"Add":""},{"Add":" ///////////"},{"Add":""},{"Add":" repo2.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nx\\nc\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h2 = record_all_output(&mut repo2, &changes, &mut txn2, &mut channel2, \"\")?;"},{"Add":" txn2.debug_to_file(&channel2, \"debug_b\")?;"},{"Add":""},{"Add":" ///////////"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un\")?;"},{"Add":" debug!(\"unrecording\");"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel, \"debug_un2\")?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" if let Some(f) = file {"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts)"},{"Add":" }"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(&buf[..], f);"},{"Add":" } else {"},{"Add":" if conflicts.len() != 1 {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts)"},{"Add":" }"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"file\"),"},{"Add":" ref c => panic!(\"c = {:#?}\", c),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let (alive_, reachable_) = txn.check_alive(&channel);"},{"Add":" if !alive_.is_empty() {"},{"Add":" panic!(\"alive: {:?}\", alive_);"},{"Add":" }"},{"Add":" if !reachable_.is_empty() {"},{"Add":" panic!(\"reachable: {:?}\", reachable_);"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" // Applying the symmetric."},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel2, h1)?;"},{"Add":" txn2.debug_to_file(&channel2, \"debug_un3\")?;"},{"Add":""},{"Add":" debug!(\"unrecording h1 = {:?}\", h1);"},{"Add":" crate::unrecord::unrecord(&mut txn2, &mut channel2, &changes, &h1)?;"},{"Add":" txn2.debug_to_file(&channel2, \"debug_un4\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// Should fail: we're resurecting a file in a directory that doesn't"},{"Add":"// exist anymore."},{"Add":"#[test]"},{"Add":"fn zombie_dir() -> 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":" repo.add_file(\"a/b/c/d\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"a/b/c/d\")?;"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.remove_path(\"a/b/c/d\")?;"},{"Add":" let h1 = record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.remove_path(\"a/b\")?;"},{"Add":" let _h2 = record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;"},{"Add":" let files = repo.list_files();"},{"Add":" assert_eq!(files, &[\"a\"]);"},{"Add":" debug!(\"files={:?}\", files);"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un\")?;"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug_un2\")?;"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),"},{"Add":" ref c => panic!(\"c = {:?}\", c),"},{"Add":" }"},{"Add":" match conflicts[1] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b/c\"),"},{"Add":" ref c => panic!(\"c = {:?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" let files = repo.list_files();"},{"Add":" debug!(\"files={:?}\", files);"},{"Add":" assert_eq!(files, &[\"a\", \"a/b\", \"a/b/c\", \"a/b/c/d\"]);"},{"Add":""},{"Add":" let (alive_, reachable_) = txn.check_alive(&channel);"},{"Add":" if !alive_.is_empty() {"},{"Add":" panic!(\"alive: {:?}\", alive_);"},{"Add":" }"},{"Add":" if !reachable_.is_empty() {"},{"Add":" panic!(\"reachable: {:?}\", reachable_);"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn nodep() -> 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":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\")?;"},{"Add":" txn.debug_inodes();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nx\\nb\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_inodes();"},{"Add":""},{"Add":" match crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h0) {"},{"Add":" Err(e) => {"},{"Add":" let e = e.downcast();"},{"Add":" if let Ok(Error::ChangeIsDependedUpon { .. }) = e {"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"},{"Add":" }"},{"Add":" _ => panic!(\"Should not be able to unrecord\"),"},{"Add":" }"},{"Add":""},{"Add":" txn.debug_inodes();"},{"Add":" let mut channel2 = txn.open_or_create_channel(\"main2\")?;"},{"Add":" match crate::unrecord::unrecord(&mut txn, &mut channel2, &changes, &h0) {"},{"Add":" Err(e) => {"},{"Add":" let e = e.downcast();"},{"Add":" if let Ok(Error::ChangeNotOnChannel { .. }) = e {"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"},{"Add":" }"},{"Add":" _ => panic!(\"Should not be able to unrecord\"),"},{"Add":" }"},{"Add":""},{"Add":" for p in txn.log(&channel.borrow(), 0) {"},{"Add":" debug!(\"p = {:?}\", p);"},{"Add":" }"},{"Add":""},{"Add":" txn.debug_inodes();"},{"Add":" txn.debug_to_file(&channel, \"debug\")?;"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;"},{"Add":""},{"Add":" for p in txn.log(&channel.borrow(), 0) {"},{"Add":" debug!(\"p = {:?}\", p);"},{"Add":" }"},{"Add":""},{"Add":" txn.debug_inodes();"},{"Add":" txn.debug_to_file(&channel, \"debug2\")?;"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h0)?;"},{"Add":" txn.debug_to_file(&channel, \"debug3\")?;"},{"Add":""},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)?;"},{"Add":" let files = repo.list_files();"},{"Add":" if !files.is_empty() {"},{"Add":" panic!(\"Files should be empty {:?}\", files);"},{"Add":" }"},{"Add":" assert!(crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .next()"},{"Add":" .is_none());"},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn file_del() -> 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 channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" repo.add_file(\"file\", b\"blabla\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.remove_path(\"file\")?;"},{"Add":" let h = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug\")?;"},{"Add":" debug!(\"unrecord h\");"},{"Add":" // Unrecording the deletion."},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h)?;"},{"Add":" txn.debug_to_file(&channel, \"debug2\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":" assert_eq!(repo.list_files(), vec![\"file\"]);"},{"Add":""},{"Add":" // Unrecording the initial change."},{"Add":" debug!(\"unrecord h0\");"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h0)?;"},{"Add":" txn.debug_to_file(&channel, \"debug3\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":" let files = repo.list_files();"},{"Add":" if !files.is_empty() {"},{"Add":" panic!(\"Files should be empty {:?}\", files);"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Unrecording a change that edits the file around a conflict marker."},{"Add":"#[test]"},{"Add":"fn self_context() -> 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 channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"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 channel, \"\")?;"},{"Add":""},{"Add":" let mut channel2 = txn.fork(&channel, \"main2\")?;"},{"Add":""},{"Add":" repo.write_file(\"file\", |w| Ok(w.write_all(b\"a\\nx\\nb\\n\")?))?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" repo.write_file(\"file\", |w| Ok(w.write_all(b\"a\\ny\\nb\\n\")?))?;"},{"Add":" let b = record_all(&mut repo, &changes, &mut txn, &mut channel2, \"\")?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, b)?;"},{"Add":" txn.debug_to_file(&channel, \"debug\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:#?}\", conflicts);"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::Order { .. } => {}"},{"Add":" ref c => panic!(\"c = {:?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.starts_with(\">>>\") {"},{"Add":" writeln!(w, \"bla\\n{}\\nbli\", l)?"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let c = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug2\")?;"},{"Add":""},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &c)?;"},{"Add":" txn.debug_to_file(&channel, \"debug3\")?;"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:#?}\", conflicts);"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::Order { .. } => {}"},{"Add":" ref c => panic!(\"c = {:?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" conflict.sort();"},{"Add":" assert_eq!("},{"Add":" conflict,"},{"Add":" vec!["},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"================================\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"a\","},{"Add":" \"b\","},{"Add":" \"x\","},{"Add":" \"y\""},{"Add":" ]"},{"Add":" );"},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn rollback_lines() -> Result<(), anyhow::Error> {"},{"Add":" rollback_(false)"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn rollback_file() -> Result<(), anyhow::Error> {"},{"Add":" rollback_(true)"},{"Add":"}"},{"Add":""},{"Add":"fn rollback_(delete_file: bool) -> 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 channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" // Write a-b-c"},{"Add":" repo.add_file(\"file\", b\"a\\nb\\nc\\n\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" // Delete -b-"},{"Add":" if delete_file {"},{"Add":" repo.remove_path(\"file\")?"},{"Add":" } else {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" }"},{"Add":" let h_del = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" // Rollback the deletion of -b-"},{"Add":" let p_del = changes.get_change(&h_del)?;"},{"Add":" debug!(\"p_del = {:#?}\", p_del);"},{"Add":" let p_inv = p_del.inverse("},{"Add":" &h_del,"},{"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 channel, h_inv)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel, \"debug\")?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts)"},{"Add":" }"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), Ok(\"a\\nb\\nc\\n\"));"},{"Add":""},{"Add":" // Unrecord the rollback"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h_inv)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel, \"debug2\")?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts)"},{"Add":" }"},{"Add":" let mut buf = Vec::new();"},{"Add":" let r = repo.read_file(\"file\", &mut buf);"},{"Add":" if delete_file {"},{"Add":" assert!(r.is_err())"},{"Add":" } else {"},{"Add":" assert_eq!(std::str::from_utf8(&buf), Ok(\"a\\nd\\n\"));"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Delete a line twice on two different channels, merge and unrecord"},{"Add":"/// only one of them. Does the deleted edge reappear? It shouldn't."},{"Add":"#[test]"},{"Add":"fn double() -> 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":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let mut channel2 = txn.open_or_create_channel(\"main2\")?;"},{"Add":""},{"Add":" repo.add_file(\"file\", b\"blabla\\nblibli\\nblublu\\n\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" debug!(\"h0 = {:?}\", h0);"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, h0)?;"},{"Add":""},{"Add":" // First deletion"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" write!(w, \"blabla\\nblibli\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" debug!(\"h1 = {:?}\", h1);"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug0\")?;"},{"Add":""},{"Add":" // Second deletion"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" write!(w, \"blabla\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h2 = record_all(&mut repo, &changes, &mut txn, &mut channel2, \"\")?;"},{"Add":" debug!(\"h2 = {:?}\", h2);"},{"Add":""},{"Add":" // Both deletions together."},{"Add":" debug!(\"applying\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug1a\")?;"},{"Add":" txn.debug_to_file(&channel2, \"debug1b\")?;"},{"Add":" debug!(\"unrecord h\");"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;"},{"Add":" txn.debug_to_file(&channel, \"debug2\")?;"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Same as `double` above, but with a (slightly) more convoluted change"},{"Add":"/// dependency graph made by rolling the change back a few times."},{"Add":"#[test]"},{"Add":"fn double_convoluted() -> 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":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" let mut channel2 = txn.open_or_create_channel(\"main2\")?;"},{"Add":""},{"Add":" repo.add_file(\"file\", b\"blabla\\nblibli\\nblublu\\n\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" debug!(\"h0 = {:?}\", h0);"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, h0)?;"},{"Add":""},{"Add":" // First deletion"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" write!(w, \"blabla\\nblibli\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" debug!(\"h1 = {:?}\", h1);"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug0\")?;"},{"Add":""},{"Add":" // Second deletion"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" write!(w, \"blabla\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let h2 = record_all(&mut repo, &changes, &mut txn, &mut channel2, \"\")?;"},{"Add":" debug!(\"h2 = {:?}\", h2);"},{"Add":""},{"Add":" // Both deletions together, then unrecord on ~channel~."},{"Add":" debug!(\"applying\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, h2)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug1a\")?;"},{"Add":" txn.debug_to_file(&channel2, \"debug1b\")?;"},{"Add":" debug!(\"unrecord h\");"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;"},{"Add":" txn.debug_to_file(&channel, \"debug2\")?;"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Same on ~channel2~, but with a few extra layers of rollbacks in between."},{"Add":" debug!(\"rolling back\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, h1)?;"},{"Add":" let rollback = |h| {"},{"Add":" let p = changes.get_change(&h).unwrap();"},{"Add":" let p_inv = p.inverse("},{"Add":" &h,"},{"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).unwrap();"},{"Add":" h_inv"},{"Add":" };"},{"Add":" let mut h = h2;"},{"Add":" for i in 0..6 {"},{"Add":" let r = rollback(h);"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel2, r).unwrap();"},{"Add":" txn.debug_to_file(&channel2, format!(\"debug_{}\", i))?;"},{"Add":" h = r"},{"Add":" }"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel2, &changes, &h1)?;"},{"Add":" txn.debug_to_file(&channel2, \"debug_final\")?;"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts)"},{"Add":" }"},{"Add":""},{"Add":" txn.commit()?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"rm_file.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id pmxSHD/C7q1dK2EUb0CLkD0B2goCZkjog2twUdtj+t0="},{"Add":"use super::*;"},{"Add":""},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn remove_file() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a/b/c/d\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" txn_alice.add_file(\"a/b/c/d\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Bob removes a/b and records"},{"Add":" repo_bob.remove_path(\"a/b/c\")?;"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"performance.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id yeulGdXdjG310z4jeyybg6GQH3njDFclmYFkTn69Y/o="},{"Add":"use super::*;"},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"// Avoiding quadratic reconnects when possible."},{"Add":"#[test]"},{"Add":"fn quadratic_pseudo_edges() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"XXXXX\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":""},{"Add":" txn.add_file(\"file\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":" let n = 100;"},{"Add":" for i in 0..=n {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for j in 0..i {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" w.write_all(&contents[..])?;"},{"Add":" for j in (0..i).rev() {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, &format!(\"debug{}\", i)).unwrap();"},{"Add":" }"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for j in 0..n {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" for j in (0..n).rev() {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, \"debug_final\").unwrap();"},{"Add":" // Test that not too many edges have been inserted."},{"Add":" {"},{"Add":" let channel = channel.borrow();"},{"Add":" let m = txn.cursor_graph(&channel.graph, None).count();"},{"Add":" let m0 = n * 8 + 6;"},{"Add":" if m > m0 {"},{"Add":" panic!(\"{} > {}\", m, m0)"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit().unwrap();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// Avoiding linear context repairs when possible."},{"Add":"use crate::MutTxnTExt;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn linear_context_repair() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"XXXXX\\nZZZZZ\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":""},{"Add":" txn.add_file(\"file\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":" let n = 10;"},{"Add":" for i in 0..=n {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for j in 0..i {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" w.write_all(&contents[..])?;"},{"Add":" for j in (0..i).rev() {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, &format!(\"debug{}\", i)).unwrap();"},{"Add":" }"},{"Add":" let mut channel2 = txn.fork(&channel, \"fork\")?;"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for j in 0..n {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" w.write_all(b\"XXXXX\\nYYYYY\\nZZZZZ\\n\")?;"},{"Add":" for j in (0..n).rev() {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" let p1 = record_all(&mut repo, &changes, &mut txn, &mut channel2, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel2, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for j in 0..n {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" for j in (0..n).rev() {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" let p2 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, \"debug_alice0\").unwrap();"},{"Add":" debug!(\"Applying P1\");"},{"Add":" txn.apply_change(&changes, &mut channel, p1)?;"},{"Add":" txn.debug_to_file(&channel, \"debug_alice\").unwrap();"},{"Add":" debug!(\"Applying P2\");"},{"Add":" txn.apply_change(&changes, &mut channel2, p2)?;"},{"Add":" txn.debug_to_file(&channel2, \"debug_bob\").unwrap();"},{"Add":""},{"Add":" // Test that not too many edges have been inserted."},{"Add":" {"},{"Add":" let channel = channel.borrow();"},{"Add":" let m = txn.cursor_graph(&channel.graph, None).count();"},{"Add":" debug!(\"m (channel, alice) = {:?}\", m);"},{"Add":" let original_edges = 8 * n + 18;"},{"Add":" if m > original_edges {"},{"Add":" panic!(\"{} > {}\", m, original_edges)"},{"Add":" }"},{"Add":" }"},{"Add":" {"},{"Add":" let channel = channel2.borrow();"},{"Add":" let m = txn.cursor_graph(&channel.graph, None).count();"},{"Add":" debug!(\"m (channel2, bob) = {:?}\", m);"},{"Add":" let original_edges = 8 * n + 18;"},{"Add":" if m > original_edges {"},{"Add":" panic!(\"{} > {}\", m, original_edges)"},{"Add":" }"},{"Add":" }"},{"Add":" txn.commit().unwrap();"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"patch.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id gXNh0eP6/JRfVcJHHR8Y4h0m0xEBUNNruLtr0w14rHw="},{"Add":"use crate::fs::*;"},{"Add":"use crate::patch::*;"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::record::*;"},{"Add":"use crate::*;"},{"Add":""},{"Add":"fn hash_mismatch(patch: &Patch3) -> Result<(), anyhow::Error> {"},{"Add":"env_logger::try_init().unwrap_or(());"},{"Add":"use crate::patch::*;"},{"Add":"let mut buf = tempfile::NamedTempFile::new()?;"},{"Add":"let mut h = patch.serialize(&mut buf)?;"},{"Add":"match h {"},{"Add":"crate::pristine::Hash::Blake3(ref mut h) => h[0] = h[0].wrapping_add(1),"},{"Add":"_ => unreachable!(),"},{"Add":"}"},{"Add":"match Patch3::deserialize(buf.path().to_str().unwrap(), &h) {"},{"Add":"Err(e) => {"},{"Add":"let e = e.downcast();"},{"Add":"if let Ok(Error::PatchHashMismatch { .. }) = e {"},{"Add":"} else {"},{"Add":"unreachable!()"},{"Add":"}"},{"Add":"}"},{"Add":"_ => unreachable!(),"},{"Add":"}"},{"Add":""},{"Add":"let mut f = PatchFile::open(buf.path().to_str().unwrap())?;"},{"Add":"assert_eq!(f.read_header()?, patch.header);"},{"Add":"assert_eq!(f.read_dependencies()?, patch.dependencies);"},{"Add":"assert_eq!(f.read_metadata()?, &patch.metadata[..]);"},{"Add":"assert_eq!(f.read_changes()?, patch.changes);"},{"Add":"Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn hash_mism() -> Result<(), anyhow::Error> {"},{"Add":"env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":"let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":"let mut repo = working_copy::memory::Memory::new();"},{"Add":"let patches = patchstore::memory::Memory::new();"},{"Add":"repo.add_file(\"file\", contents.to_vec());"},{"Add":"repo.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":"let mut env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":"let mut txn = env.mut_txn_begin();"},{"Add":"let branch = txn.open_or_create_branch(\"main\")?;"},{"Add":"let mut branch = branch.borrow_mut();"},{"Add":"add_file(&mut txn, \"file\")?;"},{"Add":"add_file(&mut txn, \"file2\")?;"},{"Add":""},{"Add":"let mut state = Builder::new();"},{"Add":"state"},{"Add":".record("},{"Add":"&mut txn,"},{"Add":"Algorithm::Myers,"},{"Add":"&mut branch,"},{"Add":"&mut repo,"},{"Add":"&patches,"},{"Add":"\"\","},{"Add":")"},{"Add":".unwrap();"},{"Add":"let rec = state.finish();"},{"Add":"let changes: Vec<_> = rec.actions"},{"Add":".into_iter()"},{"Add":".flat_map(|x| x.globalize(&txn).into_iter())"},{"Add":".collect();"},{"Add":"info!(\"changes = {:?}\", changes);"},{"Add":"let patch0 = crate::patch::Patch3::make_patch("},{"Add":"&txn,"},{"Add":"&branch,"},{"Add":"changes,"},{"Add":"rec.contents,"},{"Add":"crate::patch::PatchHeader {"},{"Add":"name: \"test\".to_string(),"},{"Add":"authors: vec![],"},{"Add":"description: None,"},{"Add":"timestamp: chrono::Utc::now(),"},{"Add":"},"},{"Add":"Vec::new(),"},{"Add":");"},{"Add":""},{"Add":"apply::apply_local_patch(&patches, &mut txn, &mut branch, &patch0, &rec.updatables)?;"},{"Add":""},{"Add":"hash_mismatch(&patch0)?;"},{"Add":""},{"Add":"txn.debug_to_file(&branch, \"debug\")?;"},{"Add":""},{"Add":"Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"partial.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id WSMNvyR4bu2brx+dqb9Z2EL3nECuN/R8COJKX3iDnto="},{"Add":"use super::*;"},{"Add":""},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn partial_clone() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"a/b/c\", contents.to_vec());"},{"Add":" repo.add_file(\"d/e/f\", contents.to_vec());"},{"Add":" repo.add_file(\"g/h/i\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" {"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" txn.add_file(\"a/b/c\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.add_file(\"d/e/f\")?;"},{"Add":" let hd = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.add_file(\"g/h/i\")?;"},{"Add":" let hg = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.rename(\"g/h/i\", \"d/e/ff\")?;"},{"Add":" txn.move_file(\"g/h/i\", \"d/e/ff\")?;"},{"Add":" let hmove = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":""},{"Add":" let inode = crate::fs::find_inode(&txn, \"d\")?;"},{"Add":" let key = txn.get_inodes(inode, None).unwrap();"},{"Add":" let changes: Vec<_> = txn.log_for_path(&channel.borrow(), key, 0).collect();"},{"Add":" let check = vec![hd, hg, hmove];"},{"Add":" assert_eq!(changes, check)"},{"Add":" }"},{"Add":" txn.commit().unwrap();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn clone_prefixes() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"a/b/c/d\", contents.to_vec());"},{"Add":" repo.add_file(\"e/f/g/h\", contents.to_vec());"},{"Add":" repo.add_file(\"i/j/k/l\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let h = {"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" txn.add_file(\"a/b/c/d\")?;"},{"Add":" txn.add_file(\"e/f/g/h\")?;"},{"Add":" txn.add_file(\"i/j/k/l\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?"},{"Add":" };"},{"Add":" let h2 = {"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" repo.write_file(\"a/b/c/d\", |w| {"},{"Add":" w.write_all(b\"edits\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" repo.write_file(\"e/f/g/h\", |w| {"},{"Add":" w.write_all(b\"edits\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"a/b/c/d\")?"},{"Add":" };"},{"Add":""},{"Add":" txn.commit().unwrap();"},{"Add":""},{"Add":" // Cloning"},{"Add":" debug!(\"Cloning\");"},{"Add":" let mut repo2 = working_copy::memory::Memory::new();"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" {"},{"Add":" let mut channel = txn2.open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel,"},{"Add":" \"e/f\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!("},{"Add":" repo2.list_files(),"},{"Add":" [\"e\", \"e/f\", \"e/f/g\", \"e/f/g/h\"]"},{"Add":" .iter()"},{"Add":" .map(|x| x.to_string())"},{"Add":" .collect::>()"},{"Add":" );"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, h2).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo2.read_file(\"a/b/c/d\", &mut buf)?;"},{"Add":" assert_eq!(buf, b\"edits\\n\");"},{"Add":" buf.clear();"},{"Add":" repo2.read_file(\"e/f/g/h\", &mut buf)?;"},{"Add":" assert_eq!(buf, contents);"},{"Add":" }"},{"Add":" txn2.commit().unwrap();"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" txn2.open_or_create_channel(\"main2\").unwrap();"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"mod.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id DQYPBj/aarc6S1hsotGYEzxSk3K5U5+4bF1dfi5WjAY="},{"Add":"use crate::changestore::ChangeStore;"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::record::{Algorithm, Builder};"},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":"use crate::*;"},{"Add":"use chrono::*;"},{"Add":""},{"Add":"mod add_file;"},{"Add":"mod change;"},{"Add":"mod clone;"},{"Add":"mod conflict;"},{"Add":"mod file_conflicts;"},{"Add":"mod filesystem;"},{"Add":"mod missing_context;"},{"Add":"mod partial;"},{"Add":"mod performance;"},{"Add":"mod rm_file;"},{"Add":"mod unrecord;"},{"Add":""},{"Add":"fn record_all<'env, T: MutTxnT, R: WorkingCopy, P: ChangeStore>("},{"Add":" repo: &mut R,"},{"Add":" store: &P,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" prefix: &str,"},{"Add":") -> Result {"},{"Add":" let mut state = Builder::new();"},{"Add":" state.record(txn, Algorithm::default(), channel, repo, store, prefix)?;"},{"Add":""},{"Add":" let rec = state.finish();"},{"Add":" let changes = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(txn))"},{"Add":" .collect();"},{"Add":" let change0 = crate::change::Change::make_change("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" changes,"},{"Add":" rec.contents,"},{"Add":" crate::change::ChangeHeader {"},{"Add":" message: \"test\".to_string(),"},{"Add":" authors: vec![],"},{"Add":" description: None,"},{"Add":" // Beware of changing the following line: two changes"},{"Add":" // doing the same thing will be equal. Sometimes we don't"},{"Add":" // want that, as in tests::unrecord::unrecord_double."},{"Add":" timestamp: Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" let hash = store.save_change(&change0)?;"},{"Add":" if log_enabled!(log::Level::Debug) {"},{"Add":" change0"},{"Add":" .write("},{"Add":" store,"},{"Add":" Some(hash),"},{"Add":" |l, _p| format!(\"{}:{}\", l.path, l.line),"},{"Add":" true,"},{"Add":" &mut std::io::stderr(),"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" }"},{"Add":" apply::apply_local_change(txn, channel, &change0, hash, &rec.updatables)?;"},{"Add":" Ok(hash)"},{"Add":"}"},{"Add":""},{"Add":"fn record_all_output<'env, T: MutTxnT, R: WorkingCopy, P: ChangeStore + Clone + Send + 'static>("},{"Add":" repo: &mut R,"},{"Add":" changes: &P,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" prefix: &str,"},{"Add":") -> Result {"},{"Add":" let hash = record_all(repo, changes, txn, channel, prefix)?;"},{"Add":" output::output_repository_no_pending(repo, changes, txn, channel, \"\", true).unwrap();"},{"Add":" Ok(hash)"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"missing_context.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id Wm0VaE4AsPZ6mzh1X0S76snwx4OGE0BFKf3AML3aYZs="},{"Add":"use super::*;"},{"Add":""},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn missing_context_newnodes_lines() -> Result<(), anyhow::Error> {"},{"Add":" missing_context_newnodes(Some(\"a\\nf\\n\"))"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn missing_context_newnodes_file() -> Result<(), anyhow::Error> {"},{"Add":" missing_context_newnodes(None)"},{"Add":"}"},{"Add":""},{"Add":"fn missing_context_newnodes(alice: Option<&str>) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let bob = b\"a\\nb\\nc\\nxyz\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\").unwrap();"},{"Add":" txn_alice.add_file(\"file\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob"},{"Add":" .write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" if let Some(alice) = alice {"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice.as_bytes()).unwrap();"},{"Add":" Ok(())"},{"Add":" })?"},{"Add":" } else {"},{"Add":" repo_alice.remove_path(\"file\")?;"},{"Add":" }"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug0\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" debug!(\"applying Bob's change\");"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" if alice.is_some() {"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf),"},{"Add":" Ok("},{"Add":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nxyz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\""},{"Add":" [..]"},{"Add":" )"},{"Add":" );"},{"Add":" } else {"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf),"},{"Add":" Ok(&\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nxyz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..])"},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" // Alice solves the conflict by confirming the deads."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|l| l.len() <= 3) {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"starting fix_deletion\");"},{"Add":" let _fix_deletion = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" info!(\"fix_deletion over\");"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" info!(\"Bob applies Alice's change\");"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h).unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":" info!(\"Outputting Bob's working_copy\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" if alice.is_some() {"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf),"},{"Add":" Ok("},{"Add":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nxyz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\""},{"Add":" [..]"},{"Add":" )"},{"Add":" );"},{"Add":" } else {"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf),"},{"Add":" Ok(&\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nxyz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..])"},{"Add":" );"},{"Add":" }"},{"Add":""},{"Add":" // Bob solves the conflict by deleting the offending line."},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|&&l| l != \"xyz\") {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"starting fix_insertion\");"},{"Add":" let _fix_insertion = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" info!(\"fix_insertion over\");"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn missing_context_newedges() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let alice = b\"d\\nf\\n\";"},{"Add":" let bob = b\"a\\nb\\nc\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_init\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":" // Bob edits and records"},{"Add":" debug!(\"Bob edits and records\");"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" debug!(\"Alice edits and records\");"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let _alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice0\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" debug!(\"Alice applies Bob's change\");"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice1\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob reverts his change."},{"Add":" debug!(\"Bob reverts\");"},{"Add":" let bob_change = changes.get_change(&bob_h)?;"},{"Add":" let inv = bob_change.inverse("},{"Add":" &bob_h,"},{"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 inv_h = changes.save_change(&inv)?;"},{"Add":" // Alice applies Bob's inverse change."},{"Add":" info!(\"Applying inverse change\");"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, inv_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice2\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"filesystem.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"use super::*;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn filesystem() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let r = tempfile::tempdir()?;"},{"Add":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" let changes = changestore::filesystem::FileSystem::from_root(f.path());"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |f| Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?))?;"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" std::fs::create_dir_all(f.path())?;"},{"Add":" let env = pristine::sanakirja::Pristine::new(f.path())?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\").unwrap();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();"},{"Add":" info!(\"applying\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)"},{"Add":" .unwrap();"},{"Add":""},{"Add":" txn.commit().unwrap();"},{"Add":""},{"Add":" repo.rename(\"dir/file\", \"dir/file.old\")?;"},{"Add":" repo.remove_path(\"dir/file.old\")?;"},{"Add":" repo.remove_path(\"dir\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn symlink() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let r = tempfile::tempdir()?;"},{"Add":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" let changes = changestore::filesystem::FileSystem::from_root(f.path());"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |f| Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?))?;"},{"Add":" std::os::unix::fs::symlink(&r.path().join(\"dir/file\"), &r.path().join(\"dir/link\")).unwrap();"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" std::fs::create_dir_all(f.path())?;"},{"Add":" let env = pristine::sanakirja::Pristine::new(f.path())?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\").unwrap();"},{"Add":" txn.add_file(\"dir/link\").unwrap();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" info!(\"applying\");"},{"Add":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)"},{"Add":" .unwrap();"},{"Add":""},{"Add":" txn.commit().unwrap();"},{"Add":""},{"Add":" repo.rename(\"dir/file\", \"dir/file.old\")?;"},{"Add":" repo.remove_path(\"dir/file.old\")?;"},{"Add":" repo.remove_path(\"dir\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn record_dead_symlink() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let r = tempfile::tempdir()?;"},{"Add":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" let changes = changestore::filesystem::FileSystem::from_root(f.path());"},{"Add":""},{"Add":" std::fs::create_dir_all(&r.path().join(\"dir\")).unwrap();"},{"Add":" std::os::unix::fs::symlink(\"../file\", &r.path().join(\"dir/link\")).unwrap();"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" std::fs::create_dir_all(f.path())?;"},{"Add":" let env = pristine::sanakirja::Pristine::new(f.path())?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/link\").unwrap();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" info!(\"applying\");"},{"Add":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)"},{"Add":" .unwrap();"},{"Add":""},{"Add":" txn.commit().unwrap();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn overwrite_dead_symlink() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let r = tempfile::tempdir()?;"},{"Add":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" let changes = changestore::filesystem::FileSystem::from_root(f.path());"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |f| Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?))?;"},{"Add":""},{"Add":" let f = tempfile::tempdir()?;"},{"Add":" std::fs::create_dir_all(f.path())?;"},{"Add":" let env = pristine::sanakirja::Pristine::new(f.path())?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\").unwrap();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" info!(\"applying\");"},{"Add":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();"},{"Add":""},{"Add":" // Substitute dir/file with a dead symlink"},{"Add":" std::fs::remove_file(&r.path().join(\"dir/file\")).unwrap();"},{"Add":" std::os::unix::fs::symlink(\"a/b/c/d/file\", &r.path().join(\"dir/file\")).unwrap();"},{"Add":" debug!(\"meta = {:?}\", std::fs::metadata(\"dir/file\"));"},{"Add":" // And output."},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel, p)?;"},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channel, \"\", true)"},{"Add":" .unwrap();"},{"Add":""},{"Add":" txn.commit().unwrap();"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"file_conflicts.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"use super::*;"},{"Add":""},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"/// Rename conflict"},{"Add":"#[test]"},{"Add":"fn same_file_test() -> Result<(), anyhow::Error> {"},{"Add":" same_file_(\"file\", \"alice\", \"bob\")"},{"Add":"}"},{"Add":""},{"Add":"/// Rename conflict"},{"Add":"#[test]"},{"Add":"fn same_file_dirs_test() -> Result<(), anyhow::Error> {"},{"Add":" same_file_(\"file\", \"alice/file\", \"bob/file\")"},{"Add":"}"},{"Add":""},{"Add":"fn same_file_(file: &str, alice: &str, bob: &str) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(file, contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" txn_alice.add_file(file).unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Alice renames \"file\" to \"alice\""},{"Add":" repo_alice.rename(file, alice)?;"},{"Add":" txn_alice.move_file(file, alice)?;"},{"Add":" debug!(\"repo_bob = {:?}\", repo_alice.list_files());"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob renames \"file\" to \"bob\""},{"Add":" repo_bob.rename(file, bob)?;"},{"Add":" txn_bob.move_file(file, bob)?;"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::MultipleNames { .. } => {}"},{"Add":" ref c => panic!(\"{:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" alice,"},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" bob,"},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::MultipleNames { .. } => {}"},{"Add":" ref c => panic!(\"{:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" // Bob solves."},{"Add":" let bob_solution ="},{"Add":" record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Alice applies Bob's solution."},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_solution)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"repo_alice = {:?}\", repo_alice.list_files());"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" txn_bob.debug_tree(\"debug_tree\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Alice and Bob move two different files to the same name."},{"Add":"#[test]"},{"Add":"fn same_name_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file1\", contents.to_vec());"},{"Add":" repo_alice.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;"},{"Add":""},{"Add":" txn_alice.add_file(\"file1\")?;"},{"Add":" txn_alice.add_file(\"file2\")?;"},{"Add":" info!(\"recording file additions\");"},{"Add":" debug!(\"working_copy = {:?}\", repo_alice);"},{"Add":" txn_alice.debug_tree(\"debug_tree\")?;"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Alice renames \"file1\" to \"file\""},{"Add":" repo_alice.rename(\"file1\", \"file\")?;"},{"Add":" txn_alice.move_file(\"file1\", \"file\")?;"},{"Add":""},{"Add":" debug!(\"repo_bob = {:?}\", repo_alice.list_files());"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob renames \"file2\" to \"file\""},{"Add":" repo_bob.rename(\"file2\", \"file\")?;"},{"Add":" txn_bob.move_file(\"file2\", \"file\")?;"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" assert!(!conflicts.is_empty());"},{"Add":""},{"Add":" let mut files_alice = repo_alice.list_files();"},{"Add":" debug!(\"repo_alice = {:?}\", files_alice);"},{"Add":" assert_eq!(files_alice.len(), 2);"},{"Add":" files_alice.sort();"},{"Add":" assert_eq!(files_alice[0], \"file\");"},{"Add":" assert!(files_alice[1].starts_with(\"file.\"));"},{"Add":""},{"Add":" // Alice solves it."},{"Add":" txn_alice.move_file(&files_alice[1], \"a1\")?;"},{"Add":" repo_alice.rename(&files_alice[0], \"file\")?;"},{"Add":" repo_alice.rename(&files_alice[1], \"a1\")?;"},{"Add":" let solution_alice = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":""},{"Add":" let mut files_bob = repo_bob.list_files();"},{"Add":" debug!(\"repo_bob = {:?}\", files_bob);"},{"Add":" assert_eq!(files_bob.len(), 2);"},{"Add":" files_bob.sort();"},{"Add":" assert_eq!(files_bob[0], \"file\");"},{"Add":" assert!(files_bob[1].starts_with(\"file.\"));"},{"Add":""},{"Add":" // Bob applies Alice's solution and checks that it does solve his problem."},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, solution_alice)?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"conflicts = {:#?}\", conflicts);"},{"Add":" }"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" let mut files_bob = repo_bob.list_files();"},{"Add":" files_bob.sort();"},{"Add":" assert_eq!(files_bob, vec![\"a1\", \"file\"]);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn file_conflicts_same_name_and_two_names() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file1\", contents.to_vec());"},{"Add":" repo_alice.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;"},{"Add":""},{"Add":" txn_alice.add_file(\"file1\")?;"},{"Add":" txn_alice.add_file(\"file2\")?;"},{"Add":" info!(\"recording file additions\");"},{"Add":" debug!(\"working_copy = {:?}\", repo_alice);"},{"Add":" txn_alice.debug_tree(\"debug_tree\")?;"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones and renames \"file2\" to \"file\""},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":" repo_bob.rename(\"file2\", \"file\")?;"},{"Add":" txn_bob.move_file(\"file2\", \"file\")?;"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice renames \"file1\" to \"file\""},{"Add":" repo_alice.rename(\"file1\", \"file\")?;"},{"Add":" txn_alice.move_file(\"file1\", \"file\")?;"},{"Add":""},{"Add":" debug!(\"repo_bob = {:?}\", repo_alice.list_files());"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Charlie clones, moves \"file1\" to \"file3\" and applies both"},{"Add":" // Alice's and Bob's change."},{"Add":" let env_charlie = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_charlie = env_charlie.mut_txn_begin();"},{"Add":" let mut channel_charlie = txn_charlie.open_or_create_channel(\"charlie\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" repo_charlie.rename(\"file1\", \"file3\")?;"},{"Add":" txn_charlie.move_file(\"file1\", \"file3\")?;"},{"Add":" let charlie_h = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie1\")?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, alice_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie2\")?;"},{"Add":" let files_charlie = repo_charlie.list_files();"},{"Add":" debug!(\"files_charlie {:?}\", files_charlie);"},{"Add":""},{"Add":" // Alice applies Bob's change and Charlie's change."},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, charlie_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let files_alice = repo_alice.list_files();"},{"Add":" debug!(\"files_alice {:?}\", files_alice);"},{"Add":" repo_alice.remove_path(&files_alice[1]).unwrap();"},{"Add":" let _alice_solution = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice3\")?;"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, charlie_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let files_bob = repo_bob.list_files();"},{"Add":" debug!(\"files_bob {:?}\", files_bob);"},{"Add":" repo_bob.remove_path(&files_bob[1]).unwrap();"},{"Add":" let _bob_solution ="},{"Add":" record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob3\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn zombie_file_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let contents2 = b\"a\\nb\\nc\\nx\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a/b/c/file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" txn_alice.add_file(\"a/b/c/file\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Alice deletes \"file\""},{"Add":" repo_alice.remove_path(\"a/b\")?;"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob edits \"file\""},{"Add":" repo_bob.write_file(\"a/b/c/file\", |w| {"},{"Add":" w.write_all(contents2)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" debug!(\"alice2\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" let files_alice = repo_alice.list_files();"},{"Add":" assert_eq!(files_alice, vec![\"a\", \"a/b\", \"a/b/c\", \"a/b/c/file\"]);"},{"Add":" for x in txn_alice.iter_tree("},{"Add":" OwnedPathId {"},{"Add":" parent_inode: Inode::ROOT,"},{"Add":" basename: crate::small_string::SmallString::new(),"},{"Add":" },"},{"Add":" None,"},{"Add":" ) {"},{"Add":" debug!(\"x = {:?}\", x);"},{"Add":" }"},{"Add":" debug!(\"recording a solution\");"},{"Add":" let alice_solution = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice3\")?;"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"repo_alice = {:?}\", repo_alice.list_files());"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let files_bob = repo_bob.list_files();"},{"Add":" assert_eq!(files_bob, vec![\"a\", \"a/b\", \"a/b/c\", \"a/b/c/file\"]);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn rename_zombie_file() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let contents2 = b\"a\\nb\\nc\\nx\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a/b/c/file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" txn_alice.add_file(\"a/b/c/file\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Alice deletes \"file\""},{"Add":" repo_alice.remove_path(\"a/b\")?;"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob renames \"file\""},{"Add":" repo_bob.rename(\"a/b/c/file\", \"a/b/c/file2\")?;"},{"Add":" repo_bob.write_file(\"a/b/c/file2\", |w| {"},{"Add":" w.write_all(contents2)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn_bob.move_file(\"a/b/c/file\", \"a/b/c/file2\")?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":""},{"Add":" debug!(\"alice2\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice3\")?;"},{"Add":" let files_alice = repo_alice.list_files();"},{"Add":" debug!(\"Alice records {:?}\", files_alice);"},{"Add":" repo_alice.rename(\"a/b/c/file\", \"a/b/c/file2\").unwrap_or(());"},{"Add":" // repo_alice.remove_path(\"a/b/c/file\").unwrap_or(());"},{"Add":" // repo_alice.remove_path(\"a/b/c/file2\").unwrap_or(());"},{"Add":""},{"Add":" txn_alice"},{"Add":" .move_file(\"a/b/c/file\", \"a/b/c/file2\")"},{"Add":" .unwrap_or(());"},{"Add":" let alice_solution = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice4\")?;"},{"Add":" debug!(\"Alice recorded {:?}\", alice_solution);"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"repo_alice = {:?}\", repo_alice.list_files());"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob3\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let files_bob = repo_bob.list_files();"},{"Add":" assert!([\"a\", \"a/b\", \"a/b/c\", \"a/b/c/file2\"]"},{"Add":" .iter()"},{"Add":" .all(|n| files_bob.iter().any(|m| m == n)));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn rename_zombie_dir() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let contents2 = b\"a\\nb\\nc\\nx\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a/b/c/file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" txn_alice.add_file(\"a/b/c/file\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Alice deletes \"file\""},{"Add":" repo_alice.remove_path(\"a/b\")?;"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob renames \"file\""},{"Add":" repo_bob.rename(\"a/b/c\", \"a/b/d\")?;"},{"Add":" repo_bob.write_file(\"a/b/d/file\", |w| {"},{"Add":" w.write_all(contents2)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn_bob.move_file(\"a/b/c\", \"a/b/d\")?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" debug!(\"alice2\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice3\")?;"},{"Add":" let files_alice = repo_alice.list_files();"},{"Add":" if files_alice.iter().any(|x| x == \"a/b/d/file\") {"},{"Add":" txn_alice.add_file(\"a/b/d/file\").unwrap_or(());"},{"Add":" } else {"},{"Add":" assert!(files_alice.iter().any(|x| x == \"a/b/c/file\"));"},{"Add":" txn_alice.move_file(\"a/b/c\", \"a/b/d\").unwrap();"},{"Add":" repo_alice.rename(\"a/b/c\", \"a/b/d\").unwrap();"},{"Add":" }"},{"Add":" debug!(\"Alice records\");"},{"Add":" let alice_solution = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice4\")?;"},{"Add":" debug!(\"Alice recorded {:?}\", alice_solution);"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"repo_alice = {:?}\", repo_alice.list_files());"},{"Add":" debug!(\"repo_bob = {:?}\", repo_bob.list_files());"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob3\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let files_bob = repo_bob.list_files();"},{"Add":" debug!(\"files_bob = {:?}\", files_bob);"},{"Add":" assert!([\"a\", \"a/b\", \"a/b/d\", \"a/b/d/file\"]"},{"Add":" .iter()"},{"Add":" .all(|n| files_bob.iter().any(|m| m == n)));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn double_zombie_file() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let contents2 = b\"a\\nb\\nc\\nx\\nd\\ne\\nf\\n\";"},{"Add":" let contents3 = b\"a\\nby\\n\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let env_charlie = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_charlie = env_charlie.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" repo_alice.add_file(\"a/b/c/file\", contents.to_vec());"},{"Add":" txn_alice.add_file(\"a/b/c/file\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" // Bob and Charlie clone"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" let mut channel_charlie = txn_charlie.open_or_create_channel(\"charlie\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, init_h).unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie0\")?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"charlie has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Alice deletes \"file\""},{"Add":" repo_alice.remove_path(\"a/b\")?;"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob edits \"file\""},{"Add":" repo_bob.write_file(\"a/b/c/file\", |w| {"},{"Add":" w.write_all(contents2)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":""},{"Add":" // Charlie edits \"file\""},{"Add":" repo_charlie.write_file(\"a/b/c/file\", |w| {"},{"Add":" w.write_all(contents3)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let charlie_h = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie1\")?;"},{"Add":""},{"Add":" // Alice applies Bob's and Charlie's changes"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, charlie_h)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" debug!(\"alice2\");"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" let files_alice = repo_alice.list_files();"},{"Add":" assert_eq!(files_alice, vec![\"a\", \"a/b\", \"a/b/c\", \"a/b/c/file\"]);"},{"Add":" assert_eq!(conflicts.len(), 5);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"a/b/c/file\", &mut buf)?;"},{"Add":" // Alice removes conflict markers."},{"Add":" repo_alice.write_file(\"a/b/c/file\", |w| {"},{"Add":" for l in std::str::from_utf8(&buf).unwrap().lines() {"},{"Add":" if l.len() < 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" let alice_solution = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice3\")?;"},{"Add":""},{"Add":" // Bob applies"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, charlie_h)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" assert_eq!(conflicts.len(), 5);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_solution)?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob3\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"bob has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Charlie applies"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, bob_h)?;"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie2\")?;"},{"Add":" debug!(\"charlie applies Alice's change\");"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, alice_h)?;"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie3\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(conflicts.len(), 5);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":" debug!(\"charlie applies Alice's solution\");"},{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" alice_solution,"},{"Add":" )?;"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie4\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"charlie has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn zombie_file_post_resolve() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let env_charlie = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_charlie = env_charlie.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" repo_alice.add_file(\"a/b/c/file\", contents.to_vec());"},{"Add":" txn_alice.add_file(\"a/b/c/file\").unwrap();"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice0\")?;"},{"Add":""},{"Add":" repo_alice.rename(\"a/b/c/file\", \"a/b/c/alice\")?;"},{"Add":" txn_alice.move_file(\"a/b/c/file\", \"a/b/c/alice\")?;"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Bob deletes \"file\""},{"Add":" repo_bob.remove_path(\"a/b/c/file\")?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h).unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:#?}\", conflicts);"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b/c/alice\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"Bob resolves\");"},{"Add":" let bob_resolution ="},{"Add":" record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"Bob has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Alice applies Bob's patch and solution."},{"Add":" debug!(\"Alice applies Bob's resolution\");"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_resolution).unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"Alice has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Charlie applies Alice's move and deletes."},{"Add":" let mut channel_charlie = txn_charlie.open_or_create_channel(\"charlie\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, init_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, alice_h).unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie0\")?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"charlie has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" debug!(\"Charlie applies Alice's move and deletes\");"},{"Add":" repo_charlie.remove_path(\"a/b/c/alice\")?;"},{"Add":" let charlie_h = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie1\")?;"},{"Add":""},{"Add":" //"},{"Add":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, bob_h).unwrap();"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie2\")?;"},{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" bob_resolution,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" txn_charlie.debug_to_file(&channel_charlie, \"debug_charlie3\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(conflicts.len(), 2);"},{"Add":" match (&conflicts[0], &conflicts[1]) {"},{"Add":" (Conflict::ZombieFile { ref path }, Conflict::MultipleNames { .. })"},{"Add":" | (Conflict::MultipleNames { .. }, Conflict::ZombieFile { ref path }) => {"},{"Add":" assert!(path == \"a/b/c/alice\" || path == \"a/b/c/file\")"},{"Add":" }"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" //"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, charlie_h).unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice3\")?;"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert!(path == \"a/b/c/file\" || path == \"a/b/c/alice\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" //"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, charlie_h).unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob3\")?;"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert!(path == \"a/b/c/file\" || path == \"a/b/c/alice\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn move_vs_delete_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" repo_alice.add_file(\"file\", b\"a\\n\".to_vec());"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":" let init = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":""},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, init)"},{"Add":" .unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Alice moves \"file\""},{"Add":" repo_alice.rename(\"file\", \"alice/file\").unwrap_or(());"},{"Add":" txn_alice.move_file(\"file\", \"alice/file\").unwrap_or(());"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice1\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob deletes \"file\""},{"Add":" repo_bob.remove_path(\"file\").unwrap_or(());"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" debug!(\"Bob applies Alice's change\");"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, alice_h)"},{"Add":" .unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:#?}\", conflicts);"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"alice/file\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":" let files = repo_bob.list_files();"},{"Add":" if files.iter().any(|f| f == \"alice/file\") {"},{"Add":" repo_bob.remove_path(\"bob\").unwrap()"},{"Add":" } else {"},{"Add":" repo_bob.remove_path(\"alice\").unwrap()"},{"Add":" }"},{"Add":" let resolution = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"Bob has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" debug!(\"Alice applies Bob's change\");"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel_alice, bob_h)"},{"Add":" .unwrap();"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice2\")"},{"Add":" .unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"alice/file\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":" debug!(\"Alice applies Bob's resolution\");"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel_alice, resolution)"},{"Add":" .unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice3\")"},{"Add":" .unwrap();"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"Alice has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// Delete the context of an edit inside a file, then delete the file,"},{"Add":"// and see if the edit has its context fixed."},{"Add":"#[test]"},{"Add":"fn delete_zombie_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" repo_alice.add_file(\"file\", b\"a\\nb\\nc\\nd\\n\".to_vec());"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":" let init = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":""},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, init)"},{"Add":" .unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Alice adds a zombie line."},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nx\\nc\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice1\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob deletes the context of Alice's new line, and then deletes"},{"Add":" // \"file\"."},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h1 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":" repo_bob.remove_path(\"file\").unwrap_or(());"},{"Add":" let bob_h2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's changes."},{"Add":" debug!(\"Alice applies Bob's change\");"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel_alice, bob_h1)"},{"Add":" .unwrap();"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice2\")"},{"Add":" .unwrap();"},{"Add":" debug!(\"Applying bob_h2\");"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel_alice, bob_h2)"},{"Add":" .unwrap();"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice3\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" let (alive, reachable) = txn_alice.check_alive(&channel_alice);"},{"Add":" if !alive.is_empty() {"},{"Add":" panic!(\"alive (bob0): {:?}\", alive);"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" panic!(\"reachable (bob0): {:?}\", reachable);"},{"Add":" }"},{"Add":""},{"Add":" crate::unrecord::unrecord(&mut txn_alice, &mut channel_alice, &changes, &bob_h2).unwrap();"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice4\")"},{"Add":" .unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"file = {:?}\", std::str::from_utf8(&buf));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn move_into_deleted_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" repo_alice.add_file(\"file\", b\"a\\n\".to_vec());"},{"Add":" repo_alice.add_dir(\"dir\");"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":" txn_alice.add_dir(\"dir\")?;"},{"Add":" let init = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":""},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, init)"},{"Add":" .unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Alice moves \"file\""},{"Add":" repo_alice.rename(\"file\", \"dir/file\").unwrap_or(());"},{"Add":" txn_alice.move_file(\"file\", \"dir/file\").unwrap_or(());"},{"Add":" let alice_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice1\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob deletes \"dir\""},{"Add":" repo_bob.remove_path(\"dir\").unwrap_or(());"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" debug!(\"Bob applies Alice's change\");"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, alice_h)"},{"Add":" .unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:#?}\", conflicts);"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"dir\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":" let resolution = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"Bob has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" debug!(\"Alice applies Bob's change\");"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel_alice, bob_h)"},{"Add":" .unwrap();"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice2\")"},{"Add":" .unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"dir\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":" debug!(\"Alice applies Bob's resolution\");"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel_alice, resolution)"},{"Add":" .unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_alice3\")"},{"Add":" .unwrap();"},{"Add":" if !conflicts.is_empty() {"},{"Add":" panic!(\"Alice has conflicts: {:?}\", conflicts);"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"conflict.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id D0balg0/wtKfdDhdphXnGFSzLq/K7vZDjx/dtkoHoyw="},{"Add":"use super::*;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn solve_order_conflict() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let alice = b\"a\\nx\\ny\\nz\\nb\\n\";"},{"Add":" let bob = b\"a\\nu\\nv\\nw\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" let check_conflict = |buf: &[u8]| -> Result<(), anyhow::Error> {"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();"},{"Add":" debug!(\"{:?}\", conflict);"},{"Add":" {"},{"Add":" let mut conflict = conflict.clone();"},{"Add":" (&mut conflict[2..9]).sort();"},{"Add":" assert_eq!("},{"Add":" conflict,"},{"Add":" vec!["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"================================\","},{"Add":" \"u\","},{"Add":" \"v\","},{"Add":" \"w\","},{"Add":" \"x\","},{"Add":" \"y\","},{"Add":" \"z\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\""},{"Add":" ]"},{"Add":" );"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" };"},{"Add":" // check_conflict(&buf)?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for (n, l) in conflict.iter().enumerate() {"},{"Add":" if n == 0 || n == 2 || n == 3 || n == 7 || n == 8 || n == 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" } else if n == 4 {"},{"Add":" writeln!(w, \"{}\\nbla!\", l)?"},{"Add":" } else if n == 6 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" check_conflict(&buf)?;"},{"Add":""},{"Add":" // Bob applies Alice's resolution"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert!(std::str::from_utf8(&buf)?.lines().all(|l| l.len() < 10));"},{"Add":""},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel_bob, &changes, &resolution).unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob3\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" check_conflict(&buf)?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id XADwz9T0kn2XwUanHtR9EYo1Be+wsQRBiLQ2UF6sFgo="},{"Add":"#[test]"},{"Add":"fn order_conflict_simple() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let alice = b\"a\\nx\\nb\\n\";"},{"Add":" let bob = b\"a\\ny\\nb\\n\";"},{"Add":" let charlie = b\"a\\nz\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Charlie clones"},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Charlie edits and records"},{"Add":" repo_charlie.write_file(\"file\", |w| {"},{"Add":" w.write_all(charlie).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let charlie_h = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie0\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" let check_conflict = |buf: &[u8]| -> Result<(), anyhow::Error> {"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();"},{"Add":" debug!(\"{:?}\", conflict);"},{"Add":" {"},{"Add":" let mut conflict = conflict.clone();"},{"Add":" (&mut conflict[2..7]).sort();"},{"Add":" assert_eq!("},{"Add":" conflict,"},{"Add":" vec!["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"================================\","},{"Add":" \"================================\","},{"Add":" \"x\","},{"Add":" \"y\","},{"Add":" \"z\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\""},{"Add":" ]"},{"Add":" );"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" };"},{"Add":" // check_conflict(&buf)?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|l| l.len() == 1) {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let mut alice_resolution = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut alice_resolution)?;"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, charlie_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" check_conflict(&buf)?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" {"},{"Add":" let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" (&mut conflict[2..6]).sort();"},{"Add":" assert_eq!("},{"Add":" conflict,"},{"Add":" vec!["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"================================\","},{"Add":" \"x\","},{"Add":" \"y\","},{"Add":" \"z\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\""},{"Add":" ]"},{"Add":" )"},{"Add":" }"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|l| l.len() == 1) {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let mut bob_resolution = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut bob_resolution)?;"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution2 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":""},{"Add":" // Charlie applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie1\")"},{"Add":" .unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_charlie.read_file(\"file\", &mut buf)?;"},{"Add":" check_conflict(&buf)?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, resolution).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, resolution2).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_charlie.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&bob_resolution),"},{"Add":" std::str::from_utf8(&buf)"},{"Add":" );"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn order_conflict_edit() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let alice = b\"a\\nx\\ny\\nb\\n\";"},{"Add":" let bob = b\"a\\nu\\nv\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" let mut is_conflict = 0;"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.len() == 1 {"},{"Add":" if is_conflict < 2 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" is_conflict += 1"},{"Add":" } else if l.as_bytes()[0] == b'<' {"},{"Add":" is_conflict = 0"},{"Add":" } else {"},{"Add":" // === or >>>"},{"Add":" is_conflict = 1"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let mut alice_resolution = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut alice_resolution)?;"},{"Add":" info!(\"resolving {:?}\", std::str::from_utf8(&alice_resolution));"},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(alice_resolution, buf);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_conflict_sides() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\n\";"},{"Add":" let alice = b\"a\\nx\\nb\\nc\\n\";"},{"Add":" let bob = b\"a\\ny\\nb\\nc\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" // Alice edits sides of the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" let mut ended = false;"},{"Add":" let mut n = 0;"},{"Add":" for l in conflict.iter() {"},{"Add":" debug!(\"line: {:?}\", l);"},{"Add":" if l.len() > 5 {"},{"Add":" if l.as_bytes()[0] == b'<' {"},{"Add":" ended = true"},{"Add":" }"},{"Add":" if true {"},{"Add":" writeln!(w, \"pre{}\\n{}\\npost{}\", n, l, n)?;"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}\", l)?;"},{"Add":" }"},{"Add":" n += 1"},{"Add":" } else if !ended {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" } else {"},{"Add":" debug!(\"writing c: {:?}\", l);"},{"Add":" writeln!(w, \"c\")?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf2)?;"},{"Add":" info!(\"{:?}\", std::str::from_utf8(&buf2).unwrap());"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));"},{"Add":""},{"Add":" // Bob applies"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf3 = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf3)?;"},{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();"},{"Add":" lines2.sort();"},{"Add":" let mut lines3: Vec<_> = std::str::from_utf8(&buf3).unwrap().lines().collect();"},{"Add":" lines3.sort();"},{"Add":" assert_eq!(lines2, lines3);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_after_conflict() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\n\";"},{"Add":" let alice = b\"a\\nx\\ny\\nb\\nc\\n\";"},{"Add":" let bob = b\"a\\nx\\ny\\nb\\nc\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" // Alice edits sides of the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" debug!(\"line: {:?}\", l);"},{"Add":" if l.len() > 5 && l.as_bytes()[0] != b'<' {"},{"Add":" writeln!(w, \"pre\\n{}\\npost\", l)?;"},{"Add":" } else if *l != \"b\" && *l != \"x\" {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" info!(\"resolving\");"},{"Add":" let resolution = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf2)?;"},{"Add":" info!(\"{:?}\", std::str::from_utf8(&buf2).unwrap());"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" let mut buf3 = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf3)?;"},{"Add":""},{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2)?.lines().collect();"},{"Add":" lines2.sort();"},{"Add":" let mut lines3: Vec<_> = std::str::from_utf8(&buf3)?.lines().collect();"},{"Add":" lines3.sort();"},{"Add":" assert_eq!(lines2, lines3);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn delete_before_marker() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\n\";"},{"Add":" let alice0 = b\"a\\nx\\ny\\nb\\nc\\n\";"},{"Add":" let alice1 = b\"a\\nx\\ny\\nz\\nb\\nc\\n\";"},{"Add":" let bob0 = b\"a\\nu\\nv\\nb\\nc\\n\";"},{"Add":" let bob1 = b\"a\\nu\\nv\\nw\\nb\\nc\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" let bob_edits: &[&[u8]] = &[bob0, bob1];"},{"Add":" let bob_changes: Vec<_> = bob_edits"},{"Add":" .iter()"},{"Add":" .map(|bob| {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel_bob, \"\").unwrap()"},{"Add":" })"},{"Add":" .collect();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" let alice_edits: &[&[u8]] = &[alice0, alice1];"},{"Add":" let alice_changes: Vec<_> = alice_edits"},{"Add":" .iter()"},{"Add":" .map(|alice| {"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\").unwrap()"},{"Add":" })"},{"Add":" .collect();"},{"Add":""},{"Add":" // Alice applies Bob's changes"},{"Add":" for bob_h in bob_changes.iter() {"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, *bob_h)?;"},{"Add":" }"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" // Alice edits sides of the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" let mut ended = false;"},{"Add":" for l in conflict.iter() {"},{"Add":" debug!(\"line: {:?}\", l);"},{"Add":" if *l == \"z\" || *l == \"w\" {"},{"Add":" } else if l.starts_with(\"<<<\") {"},{"Add":" writeln!(w, \"{}\", l)?;"},{"Add":" ended = true"},{"Add":" } else if ended {"},{"Add":" writeln!(w, \"end\\n{}\", l)?;"},{"Add":" ended = false"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}\", l)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" info!(\"resolving\");"},{"Add":" let conflict_edits = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf2)?;"},{"Add":" info!(\"{:?}\", std::str::from_utf8(&buf2).unwrap());"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));"},{"Add":""},{"Add":" // Bob pulls"},{"Add":" for alice_h in alice_changes.iter() {"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, *alice_h)?;"},{"Add":" }"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, conflict_edits)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" buf2.clear();"},{"Add":" repo.read_file(\"file\", &mut buf2)?;"},{"Add":" let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();"},{"Add":" lines.sort();"},{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();"},{"Add":" lines2.sort();"},{"Add":" assert_eq!(lines, lines2);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn conflict_last_line() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\n\";"},{"Add":" let alice = b\"a\\nx\";"},{"Add":" let bob = b\"a\\ny\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" let check_conflict = |buf: &[u8]| -> Result<(), anyhow::Error> {"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();"},{"Add":" debug!(\"{:?}\", conflict);"},{"Add":" {"},{"Add":" let mut conflict = conflict.clone();"},{"Add":" (&mut conflict[2..5]).sort();"},{"Add":" assert_eq!("},{"Add":" conflict,"},{"Add":" vec!["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"================================\","},{"Add":" \"x\","},{"Add":" \"y\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\""},{"Add":" ]"},{"Add":" );"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" };"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|l| l.len() <= 2) {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let mut buf_alice = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf_alice)?;"},{"Add":""},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" check_conflict(&buf)?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf_alice));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn zombie_last_line() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\";"},{"Add":" let alice = b\"a\\nx\";"},{"Add":" let bob = b\"\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" let check_conflict = |buf: &[u8]| -> Result<(), anyhow::Error> {"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();"},{"Add":" assert_eq!("},{"Add":" conflict,"},{"Add":" vec!["},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"x\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\""},{"Add":" ]"},{"Add":" );"},{"Add":" Ok(())"},{"Add":" };"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" {"},{"Add":" let mut state = Builder::new();"},{"Add":" state"},{"Add":" .record("},{"Add":" &mut txn,"},{"Add":" Algorithm::default(),"},{"Add":" &mut channel_alice,"},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let rec = state.finish();"},{"Add":" assert!(rec.actions.is_empty())"},{"Add":" }"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" write!(w, \"x\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let mut buf_alice = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf_alice)?;"},{"Add":""},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" check_conflict(&buf)?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf_alice));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_post_conflict() -> Result<(), anyhow::Error> {"},{"Add":" edit_post_conflict_("},{"Add":" |buf| {"},{"Add":" let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();"},{"Add":" assert!("},{"Add":" buf == &["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"0\","},{"Add":" \"1\","},{"Add":" \"2\","},{"Add":" \"================================\","},{"Add":" \"3\","},{"Add":" \"4\","},{"Add":" \"5\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\","},{"Add":" ] || buf"},{"Add":" == &["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"3\","},{"Add":" \"4\","},{"Add":" \"5\","},{"Add":" \"================================\","},{"Add":" \"0\","},{"Add":" \"1\","},{"Add":" \"2\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\","},{"Add":" ]"},{"Add":" )"},{"Add":" },"},{"Add":" |buf, w| {"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" for l in conflict.iter() {"},{"Add":" if *l == \"a\" {"},{"Add":" writeln!(w, \"a\\na'\")?"},{"Add":" } else if l.len() == 1 && *l != \"0\" && *l != \"3\" {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" },"},{"Add":" )"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_around_conflict() -> Result<(), anyhow::Error> {"},{"Add":" edit_post_conflict_("},{"Add":" |buf| {"},{"Add":" let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();"},{"Add":" assert!("},{"Add":" buf == &["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"0\","},{"Add":" \"1\","},{"Add":" \"2\","},{"Add":" \"================================\","},{"Add":" \"3\","},{"Add":" \"4\","},{"Add":" \"5\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\","},{"Add":" ] || buf"},{"Add":" == &["},{"Add":" \"a\","},{"Add":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\","},{"Add":" \"3\","},{"Add":" \"4\","},{"Add":" \"5\","},{"Add":" \"================================\","},{"Add":" \"0\","},{"Add":" \"1\","},{"Add":" \"2\","},{"Add":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\","},{"Add":" \"b\","},{"Add":" ]"},{"Add":" )"},{"Add":" },"},{"Add":" |buf, w| {"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" for l in conflict.iter() {"},{"Add":" if *l == \"a\" {"},{"Add":" writeln!(w, \"a\\na'\")?"},{"Add":" } else if *l == \"b\" {"},{"Add":" writeln!(w, \"c\")?"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" },"},{"Add":" )"},{"Add":"}"},{"Add":""},{"Add":"fn edit_post_conflict_<"},{"Add":" Check: FnMut(&[u8]),"},{"Add":" Resolve: FnOnce(&[u8], &mut dyn std::io::Write) -> Result<(), anyhow::Error>,"},{"Add":">("},{"Add":" mut check: Check,"},{"Add":" resolve: Resolve,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let alice = b\"a\\n0\\n1\\n2\\nb\\n\";"},{"Add":" let bob = b\"a\\n3\\n4\\n5\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":" check(&buf);"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" repo_alice.write_file(\"file\", |mut w| {"},{"Add":" resolve(&buf, &mut w)?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" check(&buf);"},{"Add":""},{"Add":" // Bob applies Alice's solution."},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":""},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf2)?;"},{"Add":" buf.clear();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();"},{"Add":" lines.sort();"},{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();"},{"Add":" lines2.sort();"},{"Add":" assert_eq!(lines, lines2);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn nested_conflict() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let alice = b\"a\\nx\\nb\\n\";"},{"Add":" let bob = b\"a\\ny\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" debug!(\"Alice records\");"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" debug!(\"Alice applies\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" let buf = std::str::from_utf8(&buf).unwrap();"},{"Add":" w.write_all(buf.replace(\"x\\n\", \"u\\nx\\n\").as_bytes())?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution_alice = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Bob resolves."},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" let buf = std::str::from_utf8(&buf).unwrap();"},{"Add":" w.write_all(buf.replace(\"x\\n\", \"i\\nx\\n\").as_bytes())?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let resolution_bob = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" // Alice applies Bob's resolution."},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, resolution_bob).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice3\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"{}\", std::str::from_utf8(&buf).unwrap());"},{"Add":""},{"Add":" // Bob applies Alice's resolution"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution_alice).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf2)?;"},{"Add":""},{"Add":" let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();"},{"Add":" lines.sort();"},{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();"},{"Add":" lines2.sort();"},{"Add":" assert_eq!(lines, lines2);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id Bte0vzPV77vHQoub3xRBIm5ALiVSerFDkJRoTZOrQ20="},{"Add":"#[test]"},{"Add":"fn zombie_context_resolution() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" // Alice records"},{"Add":" txn_alice.add_file(\"file\").unwrap();"},{"Add":" repo_alice.add_file(\"file\", b\"\".to_vec());"},{"Add":" let x: &[&[u8]] = &[b\"c\\n\", b\"a\\nc\\n\", b\"a\\nb\\nc\\n\", b\"a\\n\", b\"\"];"},{"Add":" let p_alice: Vec<_> = x"},{"Add":" .iter()"},{"Add":" .map(|c| {"},{"Add":" repo_alice"},{"Add":" .write_file(\"file\", |w| {"},{"Add":" w.write_all(c)?;"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap()"},{"Add":" })"},{"Add":" .collect();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p_alice[0]).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob\")?;"},{"Add":""},{"Add":" // Bob creates an order conflict just to keep line \"c\" connected"},{"Add":" // to the root."},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"x\\nc\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" debug!(\"bob records conflict\");"},{"Add":" let p_bob = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Bob applies all of Alice's other changes"},{"Add":" for (n, p) in (&p_alice[1..]).into_iter().enumerate() {"},{"Add":" info!(\"{}. Applying {:?}\", n, p);"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, *p).unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, &format!(\"debug_bob_{}\", n))?;"},{"Add":" }"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"file = {:?}\", std::str::from_utf8(&buf));"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf),"},{"Add":" Ok(\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\")"},{"Add":" );"},{"Add":""},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"x\\nc\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let resolution ="},{"Add":" record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(buf, b\"x\\nc\\n\");"},{"Add":""},{"Add":" // Alice applies Bob's change and resolution."},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, p_bob).unwrap();"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice1\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf2)?;"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf2),"},{"Add":" Ok(\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\")"},{"Add":" );"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug_alice2\")?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf2)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":"// org id tXrBFjxSrgRDsKlaKi10s0yufnnu+1r7I5vhdHV/TtY="},{"Add":"#[test]"},{"Add":"fn zombie_half_survivor() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":""},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();"},{"Add":""},{"Add":" // Alice records"},{"Add":" txn_alice.add_file(\"file\").unwrap();"},{"Add":" repo_alice.add_file(\"file\", b\"\".to_vec());"},{"Add":" let x: &[&[u8]] = &[b\"a\\nb\\nc\\nd\\n\", b\"\"];"},{"Add":" let p_alice: Vec<_> = x"},{"Add":" .iter()"},{"Add":" .map(|c| {"},{"Add":" repo_alice"},{"Add":" .write_file(\"file\", |w| {"},{"Add":" w.write_all(c)?;"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap()"},{"Add":" })"},{"Add":" .collect();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p_alice[0]).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Bob creates an order conflict just to keep line \"c\" connected"},{"Add":" // to the root."},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nx\\ny\\nz\\nc\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let p_bob = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\")?;"},{"Add":""},{"Add":" // Bob applies all of Alice's other changes"},{"Add":" for p in &p_alice[1..] {"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, *p).unwrap();"},{"Add":" }"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1_\")?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!("},{"Add":" std::str::from_utf8(&buf),"},{"Add":" Ok(\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\ny\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\")"},{"Add":" );"},{"Add":""},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nz\\nd\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let resolution ="},{"Add":" record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\")?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" assert_eq!(buf, b\"a\\nz\\nd\\n\");"},{"Add":""},{"Add":" // Alice applies Bob's change and resolution."},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, p_bob).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf2 = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf2)?;"},{"Add":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn three_way_zombie() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"u\\na\\nb\\nc\\nd\\nv\\n\";"},{"Add":" let alice = b\"u\\na\\nb\\nx\\nc\\nd\\nv\\n\";"},{"Add":" let bob = b\"u\\na\\nd\\nv\\n\";"},{"Add":" let alice_bob = b\"u\\na\\nx\\nd\\nv\\n\";"},{"Add":" let charlie = b\"u\\nv\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Charlie clones"},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" // Alice adds a line."},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Bob deletes the context."},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Charlie also deletes the context."},{"Add":" repo_charlie.write_file(\"file\", |w| {"},{"Add":" w.write_all(charlie).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie0\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"alice = {:?}\", std::str::from_utf8(&buf));"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" repo_alice.write_file(\"file\", |w| Ok(w.write_all(alice_bob)?))?;"},{"Add":""},{"Add":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's edits and resolution."},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, resolution)?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":""},{"Add":" // Charlie applies all changes"},{"Add":" /*output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )?;*/"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h)?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie1\")"},{"Add":" .unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h)?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie2\")"},{"Add":" .unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, resolution)?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie3\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// org id apJ3ammGRRUv7jQ3uZqtvWwLtPaJJpl5S0O14CnL8ps="},{"Add":"#[test]"},{"Add":"fn cyclic_conflict_resolution() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let alice = b\"a\\nx\\ny\\nz\\nb\\n\";"},{"Add":" let bob = b\"a\\nu\\nv\\nw\\nb\\n\";"},{"Add":" let charlie = b\"a\\nU\\nV\\nW\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Charlie clones and makes something independent."},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" repo_charlie.write_file(\"file\", |w| {"},{"Add":" w.write_all(charlie).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let charlie_h = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" info!(\"Done outputting Charlie's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_charlie.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Charlie = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice\").unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob\").unwrap();"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"alice: {:?}\", std::str::from_utf8(&buf));"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.len() < 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let alices_resolution ="},{"Add":" record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"bob: {:?}\", std::str::from_utf8(&buf));"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.len() < 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let _bobs_resolution = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":""},{"Add":" // Bob applies Alice's resolution"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alices_resolution).unwrap();"},{"Add":" // Bob applies Charlie's side"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, charlie_h).unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" debug!(\"outputting bob2\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob3\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" // Check that there is a conflict."},{"Add":" assert!(std::str::from_utf8(&buf)?.lines().any(|l| l.len() >= 10));"},{"Add":" debug!(\"{:?}\", std::str::from_utf8(&buf));"},{"Add":" // Solve it again, in the same way and output the result."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.len() < 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" debug!(\"resolving again\");"},{"Add":" let second_resolution = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob4\").unwrap();"},{"Add":""},{"Add":" // Check that the conflict is gone."},{"Add":" assert!(std::str::from_utf8(&buf)?.lines().all(|l| l.len() < 10));"},{"Add":""},{"Add":" // Unrecord"},{"Add":" crate::unrecord::unrecord(&mut txn, &mut channel_bob, &changes, &second_resolution).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob5\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" // Check that the conflict is back."},{"Add":" assert!(std::str::from_utf8(&buf)?.lines().any(|l| l.len() >= 10));"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn cyclic_zombies() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\n\";"},{"Add":" let alice = b\"a\\nx\\ny\\nz\\nb\\nc\\n\";"},{"Add":" let alice2 = b\"a\\nx\\nX\\ny\\nz\\nb\\nc\\n\";"},{"Add":" let alice3 = b\"a\\nx\\nX\\nY\\ny\\nz\\nb\\nc\\n\";"},{"Add":" let bob = b\"a\\nu\\nv\\nw\\nb\\nc\\n\";"},{"Add":" let bob2 = b\"a\\nu\\nU\\nv\\nw\\nb\\nc\\n\";"},{"Add":" let bob3 = b\"a\\nu\\nU\\nV\\nv\\nw\\nb\\nc\\n\";"},{"Add":" let charlie = b\"a\\nc\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_init\").unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" {"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_bob.read_file(\"file\", &mut buf).unwrap();"},{"Add":" info!(\"Bob = {:?}\", std::str::from_utf8(&buf));"},{"Add":" }"},{"Add":""},{"Add":" // Bob edits and records"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h1 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob2).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h2 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" w.write_all(bob3).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let bob_h3 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice edits and records"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h1 = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice2).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h2 = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" w.write_all(alice3).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let alice_h3 = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice0\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h1)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h3)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo_alice.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"alice: {:?}\", std::str::from_utf8(&buf));"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice1\").unwrap();"},{"Add":""},{"Add":" // Alice solves the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_alice.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.len() < 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" let alices_resolution ="},{"Add":" record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;"},{"Add":" txn.debug_to_file(&channel_alice, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" // Bob applies Alice's change"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h1).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h2).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alice_h3).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"bob: {:?}\", std::str::from_utf8(&buf));"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo_bob.write_file(\"file\", |w| {"},{"Add":" for l in conflict.iter() {"},{"Add":" if l.len() < 10 {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" info!(\"resolving\");"},{"Add":" // Bob solves the conflict"},{"Add":" let bobs_resolution = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;"},{"Add":""},{"Add":" // Charlie clones and deletes"},{"Add":" let mut repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, init_h)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h1)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alice_h3)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h1)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h2)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bob_h3)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" repo_charlie.write_file(\"file\", |w| {"},{"Add":" w.write_all(charlie).unwrap();"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let charlie_h = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":""},{"Add":" // Bob applies Alice's resolution"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, alices_resolution).unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" debug!(\"outputting bob2\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob3\").unwrap();"},{"Add":" buf.clear();"},{"Add":" repo_bob.read_file(\"file\", &mut buf)?;"},{"Add":""},{"Add":" // Bob applies Charlie's side"},{"Add":" debug!(\"applying charlie's patch\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_bob, charlie_h).unwrap();"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob4\").unwrap();"},{"Add":" let (alive_, reachable_) = txn.check_alive(&channel_bob);"},{"Add":" if !alive_.is_empty() {"},{"Add":" error!(\"alive (bob0): {:?}\", alive_);"},{"Add":" }"},{"Add":" if !reachable_.is_empty() {"},{"Add":" error!(\"reachable (bob0): {:?}\", reachable_);"},{"Add":" }"},{"Add":" debug!(\"outputting bob's repo\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_bob, \"debug_bob5\").unwrap();"},{"Add":" let (alive, reachable) = txn.check_alive(&channel_bob);"},{"Add":" if !alive.is_empty() {"},{"Add":" panic!(\"alive (bob1): {:?}\", alive);"},{"Add":" } else if !alive_.is_empty() {"},{"Add":" panic!(\"alive_ (bob1): {:?}\", alive_);"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" panic!(\"reachable (bob1): {:?}\", reachable);"},{"Add":" } else if !reachable_.is_empty() {"},{"Add":" panic!(\"reachable_ (bob1): {:?}\", reachable_);"},{"Add":" }"},{"Add":""},{"Add":" // Symmetric: Charlie applies the other sides."},{"Add":" debug!(\"Charlie applies\");"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, alices_resolution).unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, bobs_resolution).unwrap();"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie\")"},{"Add":" .unwrap();"},{"Add":" let (alive, reachable) = txn.check_alive(&channel_charlie);"},{"Add":" if !alive.is_empty() {"},{"Add":" panic!(\"alive (charlie0): {:?}\", alive);"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" panic!(\"reachable (charlie0): {:?}\", reachable);"},{"Add":" }"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.debug_to_file(&channel_charlie, \"debug_charlie1\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" let (alive, reachable) = txn.check_alive(&channel_charlie);"},{"Add":" if !alive.is_empty() {"},{"Add":" panic!(\"alive (charlie1): {:?}\", alive);"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" panic!(\"reachable (charlie1): {:?}\", reachable);"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn cyclic_files() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a/file\", contents.to_vec());"},{"Add":" repo_alice.add_file(\"b/file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;"},{"Add":" txn_alice.add_file(\"a/file\")?;"},{"Add":" txn_alice.add_file(\"b/file\")?;"},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_init\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob clones and moves a -> a/b"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":" txn_bob.move_file(\"a\", \"b/a\").unwrap();"},{"Add":" repo_bob.rename(\"a\", \"b/a\").unwrap();"},{"Add":" let ab = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":""},{"Add":" // Alice moves b -> b/a"},{"Add":" txn_alice.move_file(\"b\", \"a/b\").unwrap();"},{"Add":" repo_alice.rename(\"b\", \"a/b\").unwrap();"},{"Add":" let _ba = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, ab)?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug\").unwrap();"},{"Add":" debug!(\"outputting cycle\");"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" let v: Vec<_> = txn_alice.iter_working_copy().collect();"},{"Add":" println!(\"{:?}\", v);"},{"Add":" let (alive, reachable) = txn_alice.check_alive(&channel_alice);"},{"Add":" if !alive.is_empty() {"},{"Add":" panic!(\"alive: {:?}\", alive);"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" panic!(\"reachable: {:?}\", reachable);"},{"Add":" }"},{"Add":" debug!(\"recording the resolution\");"},{"Add":" let _resolution = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel_alice, \"debug2\").unwrap();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// org id QgpTD2RjlNLcS9Q2bivXjqgdZptO4jMCAyAKKy5M4Cw="},{"Add":"#[test]"},{"Add":"fn tree_inodes_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\n\";"},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a/b/file\", contents.to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;"},{"Add":" txn_alice.add_file(\"a/b/file\")?;"},{"Add":""},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\")?;"},{"Add":" txn_bob.add_file(\"a/b/file\")?;"},{"Add":""},{"Add":" let init_h = record_all("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" )?;"},{"Add":" txn_alice"},{"Add":" .debug_to_file(&channel_alice, \"debug_init\")"},{"Add":" .unwrap();"},{"Add":""},{"Add":" // Bob clones"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, init_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" info!(\"Done outputting Bob's working_copy\");"},{"Add":""},{"Add":" // Bob moves and deletes a/b"},{"Add":" repo_bob.rename(\"a/b/file\", \"c/d/file\")?;"},{"Add":" txn_bob.move_file(\"a/b/file\", \"c/d/file\")?;"},{"Add":" repo_bob.remove_path(\"a\")?;"},{"Add":" txn_bob.remove_file(\"a\")?;"},{"Add":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob0\").unwrap();"},{"Add":""},{"Add":" // Alice applies"},{"Add":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, bob_h)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel_alice,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" check_tree_inodes(&txn_alice, &channel_alice.borrow());"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn check_tree_inodes<'env, T: TxnT>(txn: &T, channel: &Channel) {"},{"Add":" // Sanity check"},{"Add":" for (inode, vertex) in txn.iter_inodes() {"},{"Add":" debug!(\"inode = {:?}, vertex = {:?}\", inode, vertex);"},{"Add":" let mut inode_ = inode;"},{"Add":" while !inode_.is_root() {"},{"Add":" if let Some(next) = txn.get_revtree(inode_, None) {"},{"Add":" debug!(\"next = {:?}\", next);"},{"Add":" inode_ = next.parent_inode;"},{"Add":" } else {"},{"Add":" panic!(\"inode = {:?}, inode_ = {:?}\", inode, inode_);"},{"Add":" }"},{"Add":" }"},{"Add":" if !txn.is_alive(&channel, vertex.inode_vertex()) {"},{"Add":" for e in txn.iter_adjacent("},{"Add":" &channel,"},{"Add":" vertex.inode_vertex(),"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all(),"},{"Add":" ) {"},{"Add":" error!(\"{:?} {:?} {:?}\", inode, vertex, e)"},{"Add":" }"},{"Add":" panic!("},{"Add":" \"inode {:?}, vertex {:?}, is not alive, {:?}\","},{"Add":" inode,"},{"Add":" vertex,"},{"Add":" txn.tree_path(vertex)"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"clone.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"// org id KXO4Q0zwlWvUD/nYh+BNlcg+iAVCRRrq/PjV4cNJH0k="},{"Add":"use super::*;"},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn clone_simple() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let contents2 = b\"a\\nb\\n\\nc\\nd\\nx\\nf\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut recorded_changes = Vec::new();"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" {"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":""},{"Add":" txn.add_file(\"file\")?;"},{"Add":" recorded_changes.push(record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap());"},{"Add":" txn.debug_to_file(&channel, \"debug0\").unwrap();"},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" w.write_all(contents2).unwrap();"},{"Add":" Ok(())"},{"Add":" })"},{"Add":" .unwrap();"},{"Add":" recorded_changes.push(record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap());"},{"Add":" txn.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":" }"},{"Add":" txn.commit().unwrap();"},{"Add":""},{"Add":" let mut channel_changes = Vec::new();"},{"Add":" {"},{"Add":" let txn = env.txn_begin()?;"},{"Add":" for channel in txn.iter_channels(\"\") {"},{"Add":" for (_, (i, _)) in txn.log(&channel.borrow(), 0) {"},{"Add":" channel_changes.push(i)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" info!(\"{:?}\", channel_changes);"},{"Add":" assert_eq!(channel_changes, recorded_changes);"},{"Add":" let mut repo2 = working_copy::memory::Memory::new();"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" {"},{"Add":" let mut channel = txn2.open_or_create_channel(\"main2\").unwrap();"},{"Add":" for h in channel_changes.iter() {"},{"Add":" info!(\"applying {:?}\", h);"},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, *h).unwrap();"},{"Add":" txn2.debug_to_file(&channel, \"debug2\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" }"},{"Add":" assert_eq!(repo2.list_files(), vec![\"file\".to_string()]);"},{"Add":" let mut file = Vec::new();"},{"Add":" repo2.read_file(\"file\", &mut file).unwrap();"},{"Add":" assert_eq!(file, contents2);"},{"Add":" }"},{"Add":" txn2.commit().unwrap();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn clone_prefixes() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"a/b/c/d\", contents.to_vec());"},{"Add":" repo.add_file(\"e/f/g/h\", contents.to_vec());"},{"Add":" repo.add_file(\"i/j/k/l\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let h = {"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" txn.add_file(\"a/b/c/d\")?;"},{"Add":" txn.add_file(\"e/f/g/h\")?;"},{"Add":" txn.add_file(\"i/j/k/l\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?"},{"Add":" };"},{"Add":" let h2 = {"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" repo.write_file(\"a/b/c/d\", |w| {"},{"Add":" w.write_all(b\"edits\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" repo.write_file(\"e/f/g/h\", |w| {"},{"Add":" w.write_all(b\"edits\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"a/b/c/d\")?"},{"Add":" };"},{"Add":""},{"Add":" txn.commit().unwrap();"},{"Add":""},{"Add":" // Cloning"},{"Add":" debug!(\"Cloning\");"},{"Add":" let mut repo2 = working_copy::memory::Memory::new();"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" {"},{"Add":" let mut channel = txn2.open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, h).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel,"},{"Add":" \"e/f\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!("},{"Add":" repo2.list_files(),"},{"Add":" [\"e\", \"e/f\", \"e/f/g\", \"e/f/g/h\"]"},{"Add":" .iter()"},{"Add":" .map(|x| x.to_string())"},{"Add":" .collect::>()"},{"Add":" );"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn2, &mut channel, h2).unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo2,"},{"Add":" &changes,"},{"Add":" &mut txn2,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo2.read_file(\"a/b/c/d\", &mut buf)?;"},{"Add":" assert_eq!(buf, b\"edits\\n\");"},{"Add":" buf.clear();"},{"Add":" repo2.read_file(\"e/f/g/h\", &mut buf)?;"},{"Add":" assert_eq!(buf, contents);"},{"Add":" }"},{"Add":" txn2.commit().unwrap();"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" txn2.open_or_create_channel(\"main2\").unwrap();"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"change.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"use crate::change::*;"},{"Add":"use crate::changestore::*;"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::record::*;"},{"Add":"use crate::working_copy::*;"},{"Add":"use crate::*;"},{"Add":""},{"Add":"fn hash_mismatch(change: &Change) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":" use crate::change::*;"},{"Add":" let mut buf = tempfile::NamedTempFile::new()?;"},{"Add":" let mut h = change.serialize(&mut buf)?;"},{"Add":" match h {"},{"Add":" crate::pristine::Hash::Blake3(ref mut h) => h[0] = h[0].wrapping_add(1),"},{"Add":" _ => unreachable!(),"},{"Add":" }"},{"Add":" match Change::deserialize(buf.path().to_str().unwrap(), Some(&h)) {"},{"Add":" Err(e) => {"},{"Add":" let e = e.downcast();"},{"Add":" if let Ok(Error::ChangeHashMismatch { .. }) = e {"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"},{"Add":" }"},{"Add":" _ => unreachable!(),"},{"Add":" }"},{"Add":""},{"Add":" let f = ChangeFile::open(h, buf.path().to_str().unwrap())?;"},{"Add":" assert_eq!(f.hashed(), &change.hashed);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn hash_mism() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let store = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":" repo.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" txn.add_file(\"file2\")?;"},{"Add":""},{"Add":" let mut state = Builder::new();"},{"Add":" state"},{"Add":" .record("},{"Add":" &mut txn,"},{"Add":" Algorithm::Myers,"},{"Add":" &mut channel,"},{"Add":" &mut repo,"},{"Add":" &store,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" let rec = state.finish();"},{"Add":" let changes: Vec<_> = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(&txn))"},{"Add":" .collect();"},{"Add":" info!(\"changes = {:?}\", changes);"},{"Add":" let change0 = crate::change::Change::make_change("},{"Add":" &txn,"},{"Add":" &channel,"},{"Add":" changes,"},{"Add":" rec.contents,"},{"Add":" crate::change::ChangeHeader {"},{"Add":" message: \"test\".to_string(),"},{"Add":" authors: vec![],"},{"Add":" description: None,"},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" let hash0 = store.save_change(&change0)?;"},{"Add":" apply::apply_local_change(&mut txn, &mut channel, &change0, hash0, &rec.updatables)?;"},{"Add":""},{"Add":" hash_mismatch(&change0)?;"},{"Add":""},{"Add":" txn.debug_to_file(&channel, \"debug\")?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn record_all<'env, T: MutTxnT, R: WorkingCopy, P: ChangeStore>("},{"Add":" repo: &mut R,"},{"Add":" store: &P,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" prefix: &str,"},{"Add":") -> Result<(Hash, Change), anyhow::Error> {"},{"Add":" let mut state = Builder::new();"},{"Add":" state.record(txn, Algorithm::default(), channel, repo, store, prefix)?;"},{"Add":""},{"Add":" let rec = state.finish();"},{"Add":" let changes = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(txn))"},{"Add":" .collect();"},{"Add":" let change0 = crate::change::Change::make_change("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" changes,"},{"Add":" rec.contents,"},{"Add":" crate::change::ChangeHeader {"},{"Add":" message: \"test\".to_string(),"},{"Add":" authors: vec![],"},{"Add":" description: None,"},{"Add":" // Beware of changing the following line: two changes"},{"Add":" // doing the same thing will be equal. Sometimes we don't"},{"Add":" // want that, as in tests::unrecord::unrecord_double."},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" let hash = store.save_change(&change0)?;"},{"Add":" apply::apply_local_change(txn, channel, &change0, hash, &rec.updatables)?;"},{"Add":" Ok((hash, change0))"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"#[test]"},{"Add":"fn text() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";"},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let store = changestore::memory::Memory::new();"},{"Add":" repo.add_file(\"file\", contents.to_vec());"},{"Add":" repo.add_file(\"file2\", contents.to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" txn.add_file(\"file2\")?;"},{"Add":" let (h0, change0) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;"},{"Add":" text_test(&store, &change0, h0);"},{"Add":""},{"Add":" repo.write_file(\"file\", |w| {"},{"Add":" write!(w, \"a\\nx\\nc\\ne\\ny\\nf\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let (h1, change1) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;"},{"Add":" text_test(&store, &change1, h1);"},{"Add":""},{"Add":" repo.remove_path(\"file2\")?;"},{"Add":" let (h2, change2) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;"},{"Add":" text_test(&store, &change2, h2);"},{"Add":""},{"Add":" repo.rename(\"file\", \"file3\")?;"},{"Add":" txn.move_file(\"file\", \"file3\")?;"},{"Add":" let (h3, change3) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;"},{"Add":" text_test(&store, &change3, h3);"},{"Add":""},{"Add":" // name conflicts"},{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn2 = env2.mut_txn_begin();"},{"Add":" let mut channel2 = txn2.open_or_create_channel(\"main\")?;"},{"Add":" let mut repo2 = working_copy::memory::Memory::new();"},{"Add":""},{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, h0)?;"},{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, h1)?;"},{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, h2)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true)?;"},{"Add":" repo2.rename(\"file\", \"file4\")?;"},{"Add":" txn2.move_file(\"file\", \"file4\")?;"},{"Add":" let (_, _) = record_all(&mut repo2, &store, &mut txn2, &mut channel2, \"\")?;"},{"Add":""},{"Add":" apply::apply_change(&store, &mut txn2, &mut channel2, h3)?;"},{"Add":" output::output_repository_no_pending(&mut repo2, &store, &mut txn2, &mut channel2, \"\", true)?;"},{"Add":" let (h, solution) = record_all(&mut repo2, &store, &mut txn2, &mut channel2, \"\")?;"},{"Add":""},{"Add":" text_test(&store, &solution, h);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn text_test<'env, C: ChangeStore>(c: &C, change0: &Change, h: Hash) {"},{"Add":" let mut v = Vec::new();"},{"Add":" // let channel = channel.borrow();"},{"Add":" change0"},{"Add":" .write("},{"Add":" c,"},{"Add":" Some(h),"},{"Add":" |l, _p| format!(\"{}:{}\", l.path, l.line),"},{"Add":" true,"},{"Add":" &mut v,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" for i in std::str::from_utf8(&v).unwrap().lines() {"},{"Add":" debug!(\"{}\", i);"},{"Add":" }"},{"Add":" let change1 = Change::read(std::io::Cursor::new(&v[..]), &mut HashMap::new()).unwrap();"},{"Add":" if change0.header != change1.header {"},{"Add":" error!(\"header: {:#?} != {:#?}\", change0.header, change1.header);"},{"Add":" }"},{"Add":" if change0.dependencies != change1.dependencies {"},{"Add":" error!("},{"Add":" \"deps: {:#?} != {:#?}\","},{"Add":" change0.dependencies, change1.dependencies"},{"Add":" );"},{"Add":" }"},{"Add":" if change0.extra_known != change1.extra_known {"},{"Add":" error!("},{"Add":" \"extra: {:#?} != {:#?}\","},{"Add":" change0.extra_known, change1.extra_known"},{"Add":" );"},{"Add":" }"},{"Add":" if change0.metadata != change1.metadata {"},{"Add":" error!(\"meta: {:#?} != {:#?}\", change0.metadata, change1.metadata);"},{"Add":" }"},{"Add":" if change0.changes != change1.changes {"},{"Add":" if change0.changes.len() != change1.changes.len() {"},{"Add":" error!(\"change0.changes = {:#?}\", change0.changes);"},{"Add":" error!(\"change1.changes = {:#?}\", change1.changes);"},{"Add":" } else {"},{"Add":" for (a, b) in change0.changes.iter().zip(change1.changes.iter()) {"},{"Add":" error!(\"change0: {:#?}\", a);"},{"Add":" error!(\"change1: {:#?}\", b);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if change0.contents != change1.contents {"},{"Add":" error!(\"change0.contents = {:?}\", change0.contents);"},{"Add":" error!(\"change1.contents = {:?}\", change1.contents);"},{"Add":" }"},{"Add":" assert_eq!(change0, &change1);"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"add_file.rs","metadata":420},"context":[{"change":0,"pos":248792}],"contents":[{"Add":"use super::*;"},{"Add":""},{"Add":"/// Add a simple file and clone."},{"Add":"#[test]"},{"Add":"fn add_file_test() -> 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":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" {"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\").unwrap();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":""},{"Add":" // Adding the inode another time."},{"Add":" assert!(txn.add_file(\"dir/file\").is_err());"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":" txn.commit().unwrap();"},{"Add":" }"},{"Add":" {"},{"Add":" let txn = env.txn_begin()?;"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect();"},{"Add":" assert_eq!(files, vec![\"dir\", \"dir/file\"]);"},{"Add":""},{"Add":" let channel_ = txn.load_channel(\"main\").unwrap();"},{"Add":" let channel = channel_.borrow();"},{"Add":" let mut it = crate::fs::iter_graph_children(&txn, &changes, &channel, Position::ROOT);"},{"Add":" let (key, meta, file) = it.next().unwrap();"},{"Add":" assert!(meta.is_dir());"},{"Add":" assert_eq!(file, \"dir\");"},{"Add":" assert!(it.next().is_none());"},{"Add":" let mut it = crate::fs::iter_graph_children(&txn, &changes, &channel, key);"},{"Add":" let (file_key, _, _) = it.next().unwrap();"},{"Add":" crate::fs::iter_paths(&txn, &channel_, file_key, |path| {"},{"Add":" debug!(\"begin path\");"},{"Add":" for path in path {"},{"Add":" debug!(\"path = {:?}\", path);"},{"Add":" }"},{"Add":" debug!(\"end path\");"},{"Add":" true"},{"Add":" });"},{"Add":" txn.debug_to_file(&channel_, \"debug2\").unwrap();"},{"Add":""},{"Add":" let mut it = crate::fs::iter_basenames(&txn, &changes, &channel, key);"},{"Add":" let (key, _, name) = it.next().unwrap();"},{"Add":" assert_eq!(key, Position::ROOT);"},{"Add":" assert_eq!(name, \"dir\");"},{"Add":" assert!(it.next().is_none());"},{"Add":" assert!(txn.is_tracked(\"dir/file\"));"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Test that we can add a directory with a file in it."},{"Add":"#[test]"},{"Add":"fn add_dir_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_dir(\"dir/file\")?;"},{"Add":" assert!(txn.is_tracked(\"dir\"));"},{"Add":" assert!(txn.is_tracked(\"dir/file\"));"},{"Add":""},{"Add":" let (name, inode) = crate::fs::working_copy_children(&txn, Inode::ROOT)"},{"Add":" .next()"},{"Add":" .unwrap();"},{"Add":" assert_eq!(name.as_str(), \"dir\");"},{"Add":" assert!(txn.is_directory(inode));"},{"Add":" debug!(\"name = {:?}\", inode);"},{"Add":" txn.debug_tree(\"debug_tree\")?;"},{"Add":" let mut it = crate::fs::working_copy_children(&txn, inode);"},{"Add":" let (name, _) = it.next().unwrap();"},{"Add":" assert_eq!(name.as_str(), \"file\");"},{"Add":" assert!(it.next().is_none());"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Test that we can delete a file."},{"Add":"#[test]"},{"Add":"fn del_file_test() -> 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":" txn.add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug0\").unwrap();"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, file)| file)"},{"Add":" .collect();"},{"Add":" assert_eq!(files, vec![\"dir\", \"dir/file\"]);"},{"Add":""},{"Add":" repo.remove_path(\"dir/file\")?;"},{"Add":" txn.remove_file(\"dir\")?;"},{"Add":""},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect();"},{"Add":" debug!(\"files = {:?}\", files);"},{"Add":" assert!(files.is_empty());"},{"Add":""},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":""},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect();"},{"Add":" debug!(\"files = {:?}\", files);"},{"Add":" assert!(files.is_empty());"},{"Add":""},{"Add":" // Test deletions without recording."},{"Add":" txn.add_file(\"dir2/file\")?;"},{"Add":" txn.remove_file(\"dir2\")?;"},{"Add":" assert!(crate::fs::iter_working_copy(&txn, Inode::ROOT).all(|(_, file)| file != \"dir2\"));"},{"Add":" assert!(txn.remove_file(\"dir2\").is_err());"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":""},{"Add":" {"},{"Add":" let txn = env.txn_begin()?;"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect();"},{"Add":" debug!(\"files = {:?}\", files);"},{"Add":" assert!(files.is_empty());"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Test that we can delete the end of a file."},{"Add":"#[test]"},{"Add":"fn del_eof_test() -> 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":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nc\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" let mut file = Vec::new();"},{"Add":" repo.read_file(\"dir/file\", &mut file).unwrap();"},{"Add":" assert_eq!(std::str::from_utf8(&file), Ok(\"a\\nb\\nc\\n\"));"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Just delete a few lines of a file."},{"Add":"#[test]"},{"Add":"fn del_nonzombie_test() -> 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":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" repo.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":""},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nc\\ne\\nf\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nc\\nf\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" txn.debug_to_file(&channel, \"debug0\").unwrap();"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":" repo.write_file(\"dir/file\", |w| {"},{"Add":" w.write_all(b\"a\\nb\\nc\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" let mut file = Vec::new();"},{"Add":" repo.read_file(\"dir/file\", &mut file).unwrap();"},{"Add":" assert_eq!(std::str::from_utf8(&file), Ok(\"a\\nb\\nc\\n\"));"},{"Add":" txn.debug_to_file(&channel, \"debug2\").unwrap();"},{"Add":" txn.commit()?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Are permissions properly recorded?"},{"Add":"#[test]"},{"Add":"fn permissions_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":""},{"Add":" let mut channel = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" let alice0 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug0\").unwrap();"},{"Add":""},{"Add":" repo_alice.set_permissions(\"file\", 0o755)?;"},{"Add":" let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":""},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice0)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel, \"debug_bob1\").unwrap();"},{"Add":" let bob_perm = repo_bob.file_metadata(\"file\")?;"},{"Add":" assert_eq!(bob_perm.0, 0o644);"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice1)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel, \"debug_bob2\").unwrap();"},{"Add":" let bob_perm = repo_bob.file_metadata(\"file\")?;"},{"Add":" assert_eq!(bob_perm.0, 0o755);"},{"Add":" let alice_perm = repo_alice.file_metadata(\"file\")?;"},{"Add":" assert_eq!(alice_perm.0, 0o755);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Move a file to a directory, then delete the file and clone the whole thing."},{"Add":"#[test]"},{"Add":"fn move_file_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":""},{"Add":" let mut channel = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" let alice0 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" debug!(\"alice0 = {:?}\", alice0);"},{"Add":" txn_alice.debug_to_file(&channel, \"debug0\").unwrap();"},{"Add":" txn_alice.add_dir(\"dir\")?;"},{"Add":" txn_alice.move_file(\"file\", \"dir/file2\")?;"},{"Add":""},{"Add":" repo_alice.add_dir(\"dir\");"},{"Add":" repo_alice.rename(\"file\", \"dir/file2\")?;"},{"Add":" txn_alice.debug_tree(\"debug_tree\")?;"},{"Add":" let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" debug!(\"alice1 = {:?}\", alice1);"},{"Add":" txn_alice.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":" txn_alice.debug_tree(\"debug_tree\")?;"},{"Add":" txn_alice.debug_inodes();"},{"Add":" debug!(\"{:?}\", repo_alice);"},{"Add":""},{"Add":" repo_alice.remove_path(\"dir/file2\")?;"},{"Add":" debug!(\"{:?}\", repo_alice);"},{"Add":" let alice2 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug2\").unwrap();"},{"Add":" txn_alice.commit()?;"},{"Add":""},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice0)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(repo_bob.list_files(), &[\"file\"]);"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice1)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut files = repo_bob.list_files();"},{"Add":" files.sort();"},{"Add":" assert_eq!(files, &[\"dir\", \"dir/file2\"]);"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel, alice2)?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" assert_eq!(repo_bob.list_files(), &[\"dir\"]);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"/// Overwrite a file with a move."},{"Add":"#[test]"},{"Add":"fn move_file_existing_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" repo_alice.add_file(\"file2\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" txn_alice.add_file(\"file\")?;"},{"Add":" txn_alice.add_file(\"file2\")?;"},{"Add":""},{"Add":" let mut channel = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.move_file(\"file\", \"file2\")?;"},{"Add":" repo_alice.rename(\"file\", \"file2\")?;"},{"Add":" record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":" let mut files = repo_alice.list_files();"},{"Add":" files.sort();"},{"Add":" assert_eq!(files, &[\"file2\"]);"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn move_back_delete_test() -> Result<(), anyhow::Error> {"},{"Add":" move_back_test_(true)"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn move_back_test() -> Result<(), anyhow::Error> {"},{"Add":" move_back_test_(false)"},{"Add":"}"},{"Add":""},{"Add":"fn move_back_test_(resolve_by_deleting: bool) -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"a\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" txn_alice.add_file(\"a\")?;"},{"Add":""},{"Add":" let mut channel = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" // Alice moves a -> b"},{"Add":" txn_alice.move_file(\"a\", \"b\")?;"},{"Add":" repo_alice.rename(\"a\", \"b\")?;"},{"Add":" let alice2 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":""},{"Add":" // Alice moves b back -> a"},{"Add":" txn_alice.move_file(\"b\", \"a\")?;"},{"Add":" repo_alice.rename(\"b\", \"a\")?;"},{"Add":" let alice3 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug2\").unwrap();"},{"Add":""},{"Add":" // Bob deletes in parallel to the move + moveback"},{"Add":" let mut repo_bob = working_copy::memory::Memory::new();"},{"Add":" let env_bob = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn_bob = env_bob.mut_txn_begin();"},{"Add":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, alice1)"},{"Add":" .unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" repo_bob.remove_path(\"a\")?;"},{"Add":" let bob1 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob1\").unwrap();"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, alice2)"},{"Add":" .unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob2\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"APPLYING {:?}\", alice3);"},{"Add":" txn_bob"},{"Add":" .apply_change(&changes, &mut channel_bob, alice3)"},{"Add":" .unwrap();"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob3\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" if resolve_by_deleting {"},{"Add":" debug!(\"Bob records a solution\");"},{"Add":" let bob2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob4\").unwrap();"},{"Add":""},{"Add":" // Alice applies Bob's patch."},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel, bob1)"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:?}\", conflicts);"},{"Add":" assert!(!conflicts.is_empty());"},{"Add":""},{"Add":" // Alice applies Bob's resolution"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel, bob2)"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel, \"debug_alice3\").unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:?}\", conflicts);"},{"Add":" assert!(conflicts.is_empty());"},{"Add":""},{"Add":" // Testing Bob's tree by outputting"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_bob.debug_to_file(&channel_bob, \"debug_bob4\").unwrap();"},{"Add":" debug!(\"conflicts = {:?}\", conflicts);"},{"Add":" assert!(conflicts.is_empty());"},{"Add":" } else {"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":""},{"Add":" debug!(\"Bob records a solution\");"},{"Add":" let bob2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;"},{"Add":""},{"Add":" // Alice applies Bob's patch."},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel, bob1)"},{"Add":" .unwrap();"},{"Add":" txn_alice.debug_to_file(&channel, \"debug_alice2\").unwrap();"},{"Add":""},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:?}\", conflicts);"},{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a\"),"},{"Add":" ref c => panic!(\"unexpected conflict {:#?}\", c),"},{"Add":" }"},{"Add":""},{"Add":" // Alice applies Bob's resolution"},{"Add":" txn_alice"},{"Add":" .apply_change(&changes, &mut channel, bob2)"},{"Add":" .unwrap();"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:?}\", conflicts);"},{"Add":" assert!(conflicts.is_empty());"},{"Add":""},{"Add":" // Testing Bob's tree by outputting"},{"Add":" let conflicts = output::output_repository_no_pending("},{"Add":" &mut repo_bob,"},{"Add":" &changes,"},{"Add":" &mut txn_bob,"},{"Add":" &mut channel_bob,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" debug!(\"conflicts = {:?}\", conflicts);"},{"Add":" assert!(conflicts.is_empty());"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"// Move a file into a directory, and delete the former parent in the same change."},{"Add":"#[test]"},{"Add":"fn move_delete_test() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo_alice = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":" repo_alice.add_file(\"dir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" repo_alice.add_file(\"dir/file2\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env_alice = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn_alice = env_alice.mut_txn_begin();"},{"Add":" txn_alice.add_file(\"dir/file\")?;"},{"Add":" txn_alice.add_file(\"dir/file2\")?;"},{"Add":""},{"Add":" let mut channel = txn_alice.open_or_create_channel(\"main\")?;"},{"Add":" let alice0 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" debug!(\"alice0 = {:?}\", alice0);"},{"Add":" txn_alice.debug_to_file(&channel, \"debug0\").unwrap();"},{"Add":" repo_alice.add_dir(\"dir2\");"},{"Add":" repo_alice.rename(\"dir/file\", \"dir2/file\")?;"},{"Add":" repo_alice.rename(\"dir/file2\", \"dir2/file2\")?;"},{"Add":" repo_alice.remove_path(\"dir\")?;"},{"Add":" txn_alice.move_file(\"dir/file\", \"dir2/file\")?;"},{"Add":" txn_alice.move_file(\"dir/file2\", \"dir2/file2\")?;"},{"Add":""},{"Add":" let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, \"\")?;"},{"Add":" debug!(\"alice1 = {:?}\", alice1);"},{"Add":" txn_alice.debug_to_file(&channel, \"debug1\").unwrap();"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" &mut txn_alice,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn_alice.debug_to_file(&channel, \"debug2\").unwrap();"},{"Add":""},{"Add":" repo_alice.rename(\"dir2/file\", \"dir/file\").unwrap_or(());"},{"Add":" repo_alice.rename(\"dir2/file2\", \"dir/file2\").unwrap_or(());"},{"Add":" txn_alice.move_file(\"dir2/file\", \"dir/file\").unwrap_or(());"},{"Add":" txn_alice.move_file(\"dir2/file2\", \"dir/file2\").unwrap_or(());"},{"Add":" repo_alice.remove_path(\"dir2\")?;"},{"Add":""},{"Add":" let mut state = Builder::new();"},{"Add":" debug!(\"recording in dir\");"},{"Add":" state.record("},{"Add":" &mut txn_alice,"},{"Add":" Algorithm::default(),"},{"Add":" &mut channel,"},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" \"dir\","},{"Add":" )?;"},{"Add":" debug!(\"recording in dir2\");"},{"Add":" state.record("},{"Add":" &mut txn_alice,"},{"Add":" Algorithm::default(),"},{"Add":" &mut channel,"},{"Add":" &mut repo_alice,"},{"Add":" &changes,"},{"Add":" \"dir2\","},{"Add":" )?;"},{"Add":""},{"Add":" let rec = state.finish();"},{"Add":" let changes_ = rec"},{"Add":" .actions"},{"Add":" .into_iter()"},{"Add":" .map(|rec| rec.globalize(&txn_alice))"},{"Add":" .collect();"},{"Add":" let alice2 = crate::change::Change::make_change("},{"Add":" &txn_alice,"},{"Add":" &channel,"},{"Add":" changes_,"},{"Add":" rec.contents,"},{"Add":" crate::change::ChangeHeader {"},{"Add":" message: \"test\".to_string(),"},{"Add":" authors: vec![],"},{"Add":" description: None,"},{"Add":" timestamp: Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" let h_alice2 = changes.save_change(&alice2)?;"},{"Add":" apply::apply_local_change("},{"Add":" &mut txn_alice,"},{"Add":" &mut channel,"},{"Add":" &alice2,"},{"Add":" h_alice2,"},{"Add":" &rec.updatables,"},{"Add":" )?;"},{"Add":""},{"Add":" debug!(\"done {:?}\", h_alice2);"},{"Add":" txn_alice.debug_to_file(&channel, \"debug3\").unwrap();"},{"Add":""},{"Add":" let (alive, reachable) = txn_alice.check_alive(&channel);"},{"Add":" if !alive.is_empty() {"},{"Add":" panic!(\"alive: {:?}\", alive);"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" panic!(\"reachable: {:?}\", reachable);"},{"Add":" }"},{"Add":""},{"Add":" let mut files = repo_alice.list_files();"},{"Add":" files.sort();"},{"Add":" assert_eq!(files, &[\"dir\", \"dir/file\", \"dir/file2\"]);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn file_becomes_dir_test() -> 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":" repo.add_file(\"filedir\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":" txn.add_file(\"filedir\").unwrap();"},{"Add":""},{"Add":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":""},{"Add":" repo.remove_path(\"filedir\").unwrap();"},{"Add":" repo.add_file(\"filedir/file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" txn.add_file(\"filedir/file\").unwrap();"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn record_deleted_test() -> 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":" txn.add_file(\"dir/file\")?;"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect();"},{"Add":" assert!(files.is_empty());"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn record_prefix() -> 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":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" txn.debug_to_file(&channel, \"debug\").unwrap();"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)"},{"Add":" .map(|(_, name)| name)"},{"Add":" .collect();"},{"Add":" assert!(files.is_empty());"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn record_not_in_repo() -> 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":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":" assert!(record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"dir\").is_err());"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn record_not_modified() -> 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":" let mut txn = env.mut_txn_begin();"},{"Add":" let mut channel = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" repo.add_file(\"file\", b\"a\\nb\\nc\\nd\\ne\\nf\\n\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" std::thread::sleep(std::time::Duration::from_secs(1));"},{"Add":" record_all_output(&mut repo, &changes, &mut txn, &mut channel, \"\")?;"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"small_string.rs","metadata":420},"context":[{"change":0,"pos":198146}],"contents":[{"Add":"// org id rP8Kh1k96knLJkWk+H2Hc2r6JSDxQTt2P4qm38mX8mM="},{"Add":"pub const MAX_LENGTH: usize = 255;"},{"Add":""},{"Add":"/// A string of length at most 255, with a more compact on-disk"},{"Add":"/// encoding."},{"Add":"#[repr(packed)]"},{"Add":"pub struct SmallString {"},{"Add":" pub len: u8,"},{"Add":" pub str: [u8; MAX_LENGTH],"},{"Add":"}"},{"Add":""},{"Add":"/// A borrowed version of `SmallStr`."},{"Add":"#[derive(Clone, Copy)]"},{"Add":"pub struct SmallStr<'a> {"},{"Add":" pub p: *const u8,"},{"Add":" pub marker: std::marker::PhantomData<&'a ()>,"},{"Add":"}"},{"Add":""},{"Add":"impl Clone for SmallString {"},{"Add":" fn clone(&self) -> Self {"},{"Add":" Self::from_str(self.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Debug for SmallString {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" self.as_small_str().fmt(fmt)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> PartialEq for SmallStr<'a> {"},{"Add":" fn eq(&self, x: &SmallStr) -> bool {"},{"Add":" self.as_str().eq(x.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn eq() {"},{"Add":" let s0 = SmallString::from_str(\"blabla\");"},{"Add":" let s1 = SmallString::from_str(\"blabla\");"},{"Add":" assert_eq!(s0, s1);"},{"Add":" assert_eq!(s0, s0);"},{"Add":" assert_eq!(s1, s1);"},{"Add":""},{"Add":" assert_eq!(s0.clone(), s1);"},{"Add":""},{"Add":" assert_eq!(s0.as_small_str(), s1.as_small_str());"},{"Add":" assert_eq!(s0.as_small_str(), s0.as_small_str());"},{"Add":" assert_eq!(s1.as_small_str(), s1.as_small_str());"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn debug() {"},{"Add":" let s = SmallString::from_str(\"blabla\");"},{"Add":" assert_eq!(format!(\"{:?}\", s), \"\\\"blabla\\\"\");"},{"Add":" assert_eq!(format!(\"{:?}\", s.as_small_str()), \"\\\"blabla\\\"\");"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> Eq for SmallStr<'a> {}"},{"Add":""},{"Add":"impl PartialEq for SmallString {"},{"Add":" fn eq(&self, x: &SmallString) -> bool {"},{"Add":" self.as_str().eq(x.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":"impl Eq for SmallString {}"},{"Add":"/*"},{"Add":"impl<'a> std::hash::Hash for SmallStr<'a> {"},{"Add":"fn hash(&self, x: &mut H) {"},{"Add":"self.as_str().hash(x)"},{"Add":"}"},{"Add":"}"},{"Add":"*/"},{"Add":"impl std::hash::Hash for SmallString {"},{"Add":" fn hash(&self, x: &mut H) {"},{"Add":" self.as_str().hash(x)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> PartialOrd for SmallStr<'a> {"},{"Add":" fn partial_cmp(&self, x: &SmallStr) -> Option {"},{"Add":" self.as_str().partial_cmp(x.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":"impl<'a> Ord for SmallStr<'a> {"},{"Add":" fn cmp(&self, x: &SmallStr) -> std::cmp::Ordering {"},{"Add":" self.as_str().cmp(x.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl PartialOrd for SmallString {"},{"Add":" fn partial_cmp(&self, x: &SmallString) -> Option {"},{"Add":" self.as_str().partial_cmp(x.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":"impl Ord for SmallString {"},{"Add":" fn cmp(&self, x: &SmallString) -> std::cmp::Ordering {"},{"Add":" self.as_str().cmp(x.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn ord() {"},{"Add":" let s0 = SmallString::from_str(\"1234\");"},{"Add":" let s1 = SmallString::from_str(\"5678\");"},{"Add":" assert!(s0.as_small_str() < s1.as_small_str());"},{"Add":" assert!(s0 < s1);"},{"Add":" assert_eq!(s0.cmp(&s1), std::cmp::Ordering::Less);"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> std::fmt::Debug for SmallStr<'a> {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" self.as_str().fmt(fmt)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl SmallString {"},{"Add":" pub fn new() -> Self {"},{"Add":" SmallString {"},{"Add":" len: 0,"},{"Add":" str: [0; MAX_LENGTH],"},{"Add":" }"},{"Add":" }"},{"Add":" /// ```ignore"},{"Add":" /// use libpijul::small_string::*;"},{"Add":" /// let mut s = SmallString::from_str(\"blah!\");"},{"Add":" /// assert_eq!(s.len(), s.as_str().len());"},{"Add":" /// ```"},{"Add":" pub fn len(&self) -> usize {"},{"Add":" self.len as usize"},{"Add":" }"},{"Add":""},{"Add":" /// ```ignore"},{"Add":" /// use libpijul::small_string::*;"},{"Add":" /// let mut s = SmallString::from_str(\"blah\");"},{"Add":" /// s.clear();"},{"Add":" /// assert_eq!(s.as_str(), \"\");"},{"Add":" /// assert!(s.is_empty());"},{"Add":" /// ```"},{"Add":" pub fn is_empty(&self) -> bool {"},{"Add":" self.len() == 0"},{"Add":" }"},{"Add":""},{"Add":" pub fn from_str(s: &str) -> Self {"},{"Add":" let mut b = SmallString {"},{"Add":" len: s.len() as u8,"},{"Add":" str: [0; MAX_LENGTH],"},{"Add":" };"},{"Add":" b.clone_from_str(s);"},{"Add":" b"},{"Add":" }"},{"Add":" pub fn clone_from_str(&mut self, s: &str) {"},{"Add":" self.len = s.len() as u8;"},{"Add":" (&mut self.str[..s.len()]).copy_from_slice(s.as_bytes());"},{"Add":" }"},{"Add":""},{"Add":" /// ```ignore"},{"Add":" /// use libpijul::small_string::*;"},{"Add":" /// let mut s = SmallString::from_str(\"blah\");"},{"Add":" /// s.clear();"},{"Add":" /// assert!(s.is_empty());"},{"Add":" /// ```"},{"Add":" pub fn clear(&mut self) {"},{"Add":" self.len = 0;"},{"Add":" }"},{"Add":" pub fn push_str(&mut self, s: &str) {"},{"Add":" let l = self.len as usize;"},{"Add":" assert!(l + s.len() <= 0xff);"},{"Add":" (&mut self.str[l..l + s.len()]).copy_from_slice(s.as_bytes());"},{"Add":" self.len += s.len() as u8;"},{"Add":" }"},{"Add":""},{"Add":" /// ```ignore"},{"Add":" /// use libpijul::small_string::*;"},{"Add":" /// let mut s = SmallString::from_str(\"blah\");"},{"Add":" /// let s_ = s.as_small_str();"},{"Add":" /// let s2_ = s_;"},{"Add":" /// let s3_ = s_.clone();"},{"Add":" /// assert_eq!(s_, s2_);"},{"Add":" /// assert_eq!(s_, s3_);"},{"Add":" /// ```"},{"Add":" pub fn as_small_str(&self) -> SmallStr {"},{"Add":" SmallStr {"},{"Add":" p: self as *const SmallString as *const u8,"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn as_str(&self) -> &str {"},{"Add":" self.as_small_str().as_str()"},{"Add":" }"},{"Add":""},{"Add":" pub fn as_bytes(&self) -> &[u8] {"},{"Add":" self.as_small_str().as_bytes()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl SmallStr<'static> {"},{"Add":" pub const EMPTY: SmallStr<'static> = SmallStr {"},{"Add":" p: [0].as_ptr(),"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" };"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> SmallStr<'a> {"},{"Add":" /// ```ignore"},{"Add":" /// use libpijul::small_string::*;"},{"Add":" /// let mut s = SmallString::from_str(\"\");"},{"Add":" /// assert!(s.as_small_str().is_empty());"},{"Add":" /// s.push_str(\"blah\");"},{"Add":" /// assert!(!s.as_small_str().is_empty());"},{"Add":" /// ```"},{"Add":" pub fn is_empty(&self) -> bool {"},{"Add":" self.len() == 0"},{"Add":" }"},{"Add":""},{"Add":" /// ```ignore"},{"Add":" /// use libpijul::small_string::*;"},{"Add":" /// let mut s = SmallString::from_str(\"blah\");"},{"Add":" /// assert_eq!(s.as_small_str().len(), \"blah\".len())"},{"Add":" /// ```"},{"Add":" pub fn len(&self) -> usize {"},{"Add":" unsafe { (*self.p) as usize }"},{"Add":" }"},{"Add":""},{"Add":" pub fn as_str(&self) -> &'a str {"},{"Add":" unsafe { std::str::from_utf8_unchecked(self.as_bytes()) }"},{"Add":" }"},{"Add":""},{"Add":" pub fn as_bytes(&self) -> &'a [u8] {"},{"Add":" unsafe { std::slice::from_raw_parts(self.p.offset(1), *self.p as usize) }"},{"Add":" }"},{"Add":""},{"Add":" pub fn to_owned(&self) -> SmallString {"},{"Add":" SmallString::from_str(self.as_str())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Faster than running doc tests."},{"Add":"#[test]"},{"Add":"fn all_doc_tests() {"},{"Add":" {"},{"Add":" let s = SmallString::from_str(\"blah!\");"},{"Add":" assert_eq!(s.len(), s.as_str().len());"},{"Add":" }"},{"Add":" {"},{"Add":" let mut s = SmallString::from_str(\"blah\");"},{"Add":" s.clear();"},{"Add":" assert_eq!(s.as_str(), \"\");"},{"Add":" assert!(s.is_empty());"},{"Add":" }"},{"Add":" {"},{"Add":" let mut s = SmallString::from_str(\"blah\");"},{"Add":" s.clear();"},{"Add":" assert!(s.is_empty());"},{"Add":" }"},{"Add":" {"},{"Add":" let s = SmallString::from_str(\"blah\");"},{"Add":" let s_ = s.as_small_str();"},{"Add":" let s2_ = s_;"},{"Add":" let s3_ = s_.clone();"},{"Add":" assert_eq!(s_, s2_);"},{"Add":" assert_eq!(s_, s3_);"},{"Add":" }"},{"Add":" {"},{"Add":" let mut s = SmallString::from_str(\"\");"},{"Add":" assert!(s.as_small_str().is_empty());"},{"Add":" s.push_str(\"blah\");"},{"Add":" assert!(!s.as_small_str().is_empty());"},{"Add":" }"},{"Add":" {"},{"Add":" let s = SmallString::from_str(\"blah\");"},{"Add":" assert_eq!(s.as_small_str().len(), \"blah\".len())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// An internal \"unsafe\" version of a [`small_string::SmallStr`], used"},{"Add":"/// to circumvent the absence of associated type constructors in Rust"},{"Add":"/// (else this would be borrow on a table)."},{"Add":"#[derive(Clone, Copy)]"},{"Add":"#[doc(hidden)]"},{"Add":"pub struct UnsafeSmallStr(*const u8);"},{"Add":""},{"Add":"impl std::fmt::Debug for UnsafeSmallStr {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" unsafe { self.to_small_str().fmt(fmt) }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl UnsafeSmallStr {"},{"Add":" pub fn from_small_str(u: SmallStr) -> UnsafeSmallStr {"},{"Add":" UnsafeSmallStr(u.p)"},{"Add":" }"},{"Add":" pub unsafe fn to_small_str<'a>(&self) -> SmallStr<'a> {"},{"Add":" SmallStr {"},{"Add":" p: self.0,"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl sanakirja::Representable for UnsafeSmallStr {"},{"Add":" fn alignment() -> sanakirja::Alignment {"},{"Add":" sanakirja::Alignment::B1"},{"Add":" }"},{"Add":" fn onpage_size(&self) -> u16 {"},{"Add":" unsafe {"},{"Add":" let len = (*self.0) as u16;"},{"Add":" 1 + len"},{"Add":" }"},{"Add":" }"},{"Add":" unsafe fn write_value(&self, p: *mut u8) {"},{"Add":" std::ptr::copy(self.0, p, self.onpage_size() as usize)"},{"Add":" }"},{"Add":" unsafe fn read_value(p: *const u8) -> Self {"},{"Add":" UnsafeSmallStr(p)"},{"Add":" }"},{"Add":" unsafe fn cmp_value(&self, _: &T, x: Self) -> std::cmp::Ordering {"},{"Add":" let a = UnsafeSmallStr(self.0).to_small_str();"},{"Add":" let b = x.to_small_str();"},{"Add":" a.as_str().cmp(b.as_str())"},{"Add":" }"},{"Add":" type PageOffsets = std::iter::Empty;"},{"Add":" fn page_offsets(&self) -> Self::PageOffsets {"},{"Add":" std::iter::empty()"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"record.rs","metadata":420},"context":[{"change":0,"pos":198146}],"contents":[{"Add":"//! Record a change from a pristine and a working copy."},{"Add":"use crate::alive::retrieve;"},{"Add":"use crate::change::*;"},{"Add":"use crate::changestore::ChangeStore;"},{"Add":"pub use crate::diff::Algorithm;"},{"Add":"use crate::path::{components, Components};"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::small_string::SmallString;"},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":"use crate::{diff, Error};"},{"Add":"use std::collections::{HashMap, HashSet};"},{"Add":""},{"Add":"/// A change in the process of being recorded. This is typically"},{"Add":"/// created using `RecordState::new`."},{"Add":"pub struct Builder {"},{"Add":" pub(crate) rec: Recorded,"},{"Add":" pub(crate) redundant: Vec<(Vertex, Edge)>,"},{"Add":" recorded_inodes: HashMap>>,"},{"Add":" deleted_vertices: HashSet>,"},{"Add":" former_parents: Vec,"},{"Add":" force_rediff: bool,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"struct Parent {"},{"Add":" basename: String,"},{"Add":" metadata: InodeMetadata,"},{"Add":" parent: Position>,"},{"Add":"}"},{"Add":""},{"Add":"/// The result of recording a change:"},{"Add":"pub struct Recorded {"},{"Add":" /// The \"byte contents\" of the change."},{"Add":" pub contents: Vec,"},{"Add":" /// The current records, to be lated converted into change operations."},{"Add":" pub actions: Vec, Local>>,"},{"Add":" /// The updates that need to be made to the ~tree~ and ~revtree~"},{"Add":" /// tables when this change is applied to the local repository."},{"Add":" pub updatables: HashMap,"},{"Add":" /// The size of the largest file that was recorded in this change."},{"Add":" pub largest_file: u64,"},{"Add":" /// Whether we have recorded binary files."},{"Add":" pub has_binary_files: bool,"},{"Add":"}"},{"Add":""},{"Add":"impl Builder {"},{"Add":" /// Initialise a `Builder`."},{"Add":" pub fn new() -> Self {"},{"Add":" Builder {"},{"Add":" rec: Recorded {"},{"Add":" contents: Vec::new(),"},{"Add":" actions: Vec::new(),"},{"Add":" updatables: HashMap::new(),"},{"Add":" has_binary_files: false,"},{"Add":" largest_file: 0,"},{"Add":" },"},{"Add":" redundant: Vec::new(),"},{"Add":" recorded_inodes: HashMap::new(),"},{"Add":" deleted_vertices: HashSet::new(),"},{"Add":" former_parents: Vec::new(),"},{"Add":" force_rediff: true,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" /// Finish the recording."},{"Add":" pub fn finish(self) -> Recorded {"},{"Add":" self.rec"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// An account of the files that have been added, moved or deleted, as"},{"Add":"/// returned by record, and used by apply (when applying a change"},{"Add":"/// created locally) to update the trees and inodes databases."},{"Add":"#[derive(Debug, Hash, PartialEq, Eq)]"},{"Add":"pub enum InodeUpdate {"},{"Add":" Add {"},{"Add":" /// Inode vertex in the graph."},{"Add":" pos: ChangePosition,"},{"Add":" /// `Inode` added by this file addition."},{"Add":" inode: Inode,"},{"Add":" },"},{"Add":" Deleted {"},{"Add":" /// `Inode` of the deleted file."},{"Add":" inode: Inode,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Clone)]"},{"Add":"struct RecordItem<'a> {"},{"Add":" v_papa: Position>,"},{"Add":" papa: Inode,"},{"Add":" inode: Inode,"},{"Add":" basename: String,"},{"Add":" full_path: String,"},{"Add":" metadata: InodeMetadata,"},{"Add":" components: Components<'a>,"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> RecordItem<'a> {"},{"Add":" fn root(prefix: &'a str) -> Self {"},{"Add":" RecordItem {"},{"Add":" inode: Inode::ROOT,"},{"Add":" papa: Inode::ROOT,"},{"Add":" v_papa: Position::OPTION_ROOT,"},{"Add":" basename: String::new(),"},{"Add":" full_path: String::new(),"},{"Add":" metadata: InodeMetadata::new(0, true),"},{"Add":" components: components(prefix),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"const CHECK_UTF8: usize = 1000;"},{"Add":""},{"Add":"/// Ignore inodes that are in another channel"},{"Add":"fn get_inodes(txn: &T, channel: &Channel, inode: Inode) -> Option> {"},{"Add":" if let Some(vertex) = txn.get_inodes(inode, None) {"},{"Add":" if txn"},{"Add":" .get_changeset(&channel.changes, vertex.change, None)"},{"Add":" .is_some()"},{"Add":" {"},{"Add":" Some(vertex)"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Builder {"},{"Add":" pub(crate) fn record("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" diff_algorithm: diff::Algorithm,"},{"Add":" channel: &mut ChannelRef,"},{"Add":" working_copy: &mut W,"},{"Add":" changes: &C,"},{"Add":" prefix: &str,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let now = std::time::Instant::now();"},{"Add":" let channel = channel.borrow();"},{"Add":" let mut stack = vec![RecordItem::root(prefix)];"},{"Add":" while let Some(mut item) = stack.pop() {"},{"Add":" debug!(\"stack.pop() = Some({:?})\", item);"},{"Add":""},{"Add":" // Check for moves and file conflicts."},{"Add":" let vertex = if let Some(vertex) = self.recorded_inodes.get(&item.inode) {"},{"Add":" *vertex"},{"Add":" } else if item.inode == Inode::ROOT {"},{"Add":" self.recorded_inodes"},{"Add":" .insert(Inode::ROOT, Position::OPTION_ROOT);"},{"Add":" self.delete_obsolete_children("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" working_copy,"},{"Add":" &item.full_path,"},{"Add":" Position::ROOT,"},{"Add":" );"},{"Add":" Position::OPTION_ROOT"},{"Add":" } else if let Some(vertex) = get_inodes(txn, &channel, item.inode) {"},{"Add":" self.record_existing_file("},{"Add":" txn,"},{"Add":" diff_algorithm,"},{"Add":" &channel,"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" &item,"},{"Add":" vertex,"},{"Add":" )?;"},{"Add":" self.recorded_inodes.insert(item.inode, vertex.to_option());"},{"Add":" self.delete_obsolete_children("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" working_copy,"},{"Add":" &item.full_path,"},{"Add":" Position::ROOT,"},{"Add":" );"},{"Add":" vertex.to_option()"},{"Add":" } else {"},{"Add":" match self.add_file(working_copy, item.clone()) {"},{"Add":" Ok(Some(vertex)) => {"},{"Add":" // Path addition (maybe just a single directory)."},{"Add":" self.recorded_inodes.insert(item.inode, vertex);"},{"Add":" vertex"},{"Add":" }"},{"Add":" Ok(None) => continue,"},{"Add":" Err(_) => {"},{"Add":" let parent = txn.get_revtree(item.inode, None).unwrap().to_owned();"},{"Add":" info!(\"recursively deleting {:?} {:?}\", parent, item.inode);"},{"Add":" crate::fs::rec_delete(txn, parent, item.inode, false)?;"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" // Move on to the next step."},{"Add":" self.push_children("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" working_copy,"},{"Add":" &mut item,"},{"Add":" vertex,"},{"Add":" &mut stack,"},{"Add":" prefix,"},{"Add":" )?;"},{"Add":" }"},{"Add":" crate::TIMERS.lock().unwrap().record += now.elapsed();"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" // org id Xhmtot+omA6Cs8gd3eURvHuvO/QxyZXUuMmXS3KcYvs="},{"Add":" fn add_file("},{"Add":" &mut self,"},{"Add":" working_copy: &mut W,"},{"Add":" item: RecordItem,"},{"Add":" ) -> Result>>, anyhow::Error> {"},{"Add":" debug!(\"record_file_addition {:?}\", item);"},{"Add":" // org id 0DBdlruBGIG8VfGv40IJofXY3H0uMRRZOXqAd6vDZUk="},{"Add":" let meta = working_copy.file_metadata(&item.full_path)?;"},{"Add":" let name_start = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" meta.write(&mut self.rec.contents).unwrap();"},{"Add":" self.rec.contents.extend(item.basename.as_bytes());"},{"Add":" let name_end = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" // org id 3YhQMj68U/yx+DuSuj48c2C2aIypx8Oo+g8bIX3x9Wk="},{"Add":" self.rec.contents.push(0);"},{"Add":" let inode_pos = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" self.rec.contents.push(0);"},{"Add":""},{"Add":" let contents = if meta.is_file() {"},{"Add":" let start = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" working_copy.read_file(&item.full_path, &mut self.rec.contents)?;"},{"Add":" let end = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" self.rec.largest_file = self.rec.largest_file.max(end.0 - start.0);"},{"Add":" self.rec.has_binary_files |= {"},{"Add":" let s = start.0 as usize;"},{"Add":" let e = (end.0 as usize).min(s + CHECK_UTF8 + 4);"},{"Add":" let utf8 = std::str::from_utf8(&self.rec.contents[s..e]);"},{"Add":" debug!(\"utf8 = {:?}\", utf8);"},{"Add":" match utf8 {"},{"Add":" Err(e) => e.valid_up_to() < CHECK_UTF8,"},{"Add":" Ok(_) => false,"},{"Add":" }"},{"Add":" };"},{"Add":" self.rec.contents.push(0);"},{"Add":" if self.rec.contents.len() as u64 > inode_pos.0 + 1 {"},{"Add":" Some(Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![Position {"},{"Add":" change: None,"},{"Add":" pos: inode_pos,"},{"Add":" }],"},{"Add":" down_context: vec![],"},{"Add":" start,"},{"Add":" end,"},{"Add":" flag: EdgeFlags::empty(),"},{"Add":" inode: Position {"},{"Add":" change: None,"},{"Add":" pos: inode_pos,"},{"Add":" },"},{"Add":" }))"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"},{"Add":" // org id rGmDCfATnak44N1gQ/6fWM8leRH20nehuPdcnwZH06U="},{"Add":" self.rec.actions.push(Record::FileAdd {"},{"Add":" add_name: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![item.v_papa],"},{"Add":" down_context: vec![],"},{"Add":" start: name_start,"},{"Add":" end: name_end,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" inode: item.v_papa,"},{"Add":" }),"},{"Add":" add_inode: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![Position {"},{"Add":" change: None,"},{"Add":" pos: name_end,"},{"Add":" }],"},{"Add":" down_context: vec![],"},{"Add":" start: inode_pos,"},{"Add":" end: inode_pos,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" inode: item.v_papa,"},{"Add":" }),"},{"Add":" contents,"},{"Add":" path: item.full_path.clone(),"},{"Add":" });"},{"Add":" debug!(\"{:?}\", self.rec.actions.last().unwrap());"},{"Add":" // org id IEO9vkKZ3U+8uhaTOe+3A3ZMCX9FjBgVub1CSotzKkY="},{"Add":" self.rec.updatables.insert("},{"Add":" self.rec.actions.len(),"},{"Add":" InodeUpdate::Add {"},{"Add":" inode: item.inode,"},{"Add":" pos: inode_pos,"},{"Add":" },"},{"Add":" );"},{"Add":" // org id jPYMsfp8Xwvr+CK+4qpMI3GVICLl/d/DN0IhYY+oXo4="},{"Add":" if meta.is_dir() {"},{"Add":" Ok(Some(Position {"},{"Add":" change: None,"},{"Add":" pos: inode_pos,"},{"Add":" }))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn record_existing_file("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" diff_algorithm: diff::Algorithm,"},{"Add":" channel: &Channel,"},{"Add":" working_copy: &mut W,"},{"Add":" changes: &C,"},{"Add":" item: &RecordItem,"},{"Add":" vertex: Position,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" debug!("},{"Add":" \"record_existing_file {:?}: {:?} {:?}\","},{"Add":" item.full_path, item.inode, vertex"},{"Add":" );"},{"Add":" // Former parent(s) of vertex"},{"Add":" self.former_parents.clear();"},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::PARENT;"},{"Add":" let f1 = EdgeFlags::all();"},{"Add":" let mut is_deleted = true;"},{"Add":" for name_ in txn"},{"Add":" .iter_adjacent(&channel, vertex.inode_vertex(), f0, f1)"},{"Add":" .filter(|e| e.flag.contains(EdgeFlags::PARENT))"},{"Add":" {"},{"Add":" debug!(\"name_ = {:?}\", name_);"},{"Add":" if name_.flag.contains(EdgeFlags::DELETED) {"},{"Add":" debug!(\"is_deleted {:?}: {:?}\", item.full_path, name_);"},{"Add":" is_deleted = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" let name_dest = txn.find_block_end(&channel, name_.dest).unwrap();"},{"Add":" let mut name = Vec::new();"},{"Add":" changes.get_contents(|p| txn.get_external(p), name_dest, &mut name)?;"},{"Add":" let (metadata, basename) = name.split_at(2);"},{"Add":" let metadata = InodeMetadata::from_basename(metadata);"},{"Add":" let basename = std::str::from_utf8(basename).unwrap().to_string();"},{"Add":" debug!(\"former basename of {:?}: {:?}\", vertex, basename);"},{"Add":" if let Some(v_papa) = txn.iter_adjacent(&channel, name_dest, f0, f1).next() {"},{"Add":" self.former_parents.push(Parent {"},{"Add":" basename,"},{"Add":" metadata,"},{"Add":" parent: v_papa.dest.to_option(),"},{"Add":" })"},{"Add":" }"},{"Add":" }"},{"Add":" debug!("},{"Add":" \"record_existing_file: {:?} {:?} {:?}\","},{"Add":" item, self.former_parents, is_deleted,"},{"Add":" );"},{"Add":" assert!(!self.former_parents.is_empty());"},{"Add":" if let Ok(new_meta) = working_copy.file_metadata(&item.full_path) {"},{"Add":" debug!(\"new_meta = {:?}\", new_meta);"},{"Add":" if self.former_parents.len() > 1"},{"Add":" || self.former_parents[0].basename != item.basename"},{"Add":" || self.former_parents[0].metadata != item.metadata"},{"Add":" || self.former_parents[0].parent != item.v_papa"},{"Add":" || is_deleted"},{"Add":" {"},{"Add":" // This parent has changed."},{"Add":" let new_papa = *self.recorded_inodes.get(&item.papa).unwrap();"},{"Add":" debug!(\"new_papa = {:?}\", new_papa);"},{"Add":" self.record_moved_file("},{"Add":" changes,"},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" &item,"},{"Add":" vertex,"},{"Add":" new_papa,"},{"Add":" self.former_parents[0].metadata,"},{"Add":" )?"},{"Add":" }"},{"Add":" if new_meta.is_file()"},{"Add":" && (self.force_rediff"},{"Add":" || modified_since_last_commit(&channel, working_copy, &item.full_path)?)"},{"Add":" {"},{"Add":" let mut ret = retrieve(txn, &channel, vertex);"},{"Add":" let mut b = Vec::new();"},{"Add":" working_copy.read_file(&item.full_path, &mut b)?;"},{"Add":" debug!(\"diffing…\");"},{"Add":" let len = self.rec.actions.len();"},{"Add":" self.diff("},{"Add":" changes,"},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" diff_algorithm,"},{"Add":" item.full_path.clone(),"},{"Add":" vertex.to_option(),"},{"Add":" &mut ret,"},{"Add":" &b,"},{"Add":" )?;"},{"Add":" debug!(\"new actions: {:?}\", &self.rec.actions.len() - len);"},{"Add":" }"},{"Add":" } else {"},{"Add":" debug!(\"calling record_deleted_file on {:?}\", item.full_path);"},{"Add":" self.record_deleted_file(txn, &channel, working_copy, &item.full_path, vertex)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn delete_obsolete_children<'a, T: MutTxnT, W: WorkingCopy>("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" working_copy: &W,"},{"Add":" full_path: &str,"},{"Add":" v: Position,"},{"Add":" ) {"},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let f1 = f0 | EdgeFlags::PSEUDO;"},{"Add":" debug!(\"v = {:?}\", v);"},{"Add":" for child in txn.iter_adjacent(&channel, v.inode_vertex(), f0, f1) {"},{"Add":" let child = txn.find_block(&channel, child.dest).unwrap();"},{"Add":" for grandchild in txn.iter_adjacent(&channel, child, f0, f1) {"},{"Add":" debug!(\"grandchild {:?}\", grandchild);"},{"Add":" let needs_deletion = if let Some(inode) = txn.get_revinodes(grandchild.dest, None) {"},{"Add":" debug!(\"inode = {:?} {:?}\", inode, txn.get_revtree(inode, None));"},{"Add":" txn.get_revtree(inode, None).is_none()"},{"Add":" } else {"},{"Add":" true"},{"Add":" };"},{"Add":" if needs_deletion {"},{"Add":" // delete recursively."},{"Add":" self.record_deleted_file("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" working_copy,"},{"Add":" full_path,"},{"Add":" grandchild.dest,"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn push_children<'a, T: MutTxnT, W: WorkingCopy>("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" working_copy: &W,"},{"Add":" item: &mut RecordItem<'a>,"},{"Add":" vertex: Position>,"},{"Add":" stack: &mut Vec>,"},{"Add":" prefix: &str,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" let comp = item.components.next();"},{"Add":" let full_path = item.full_path.clone();"},{"Add":" let fileid = OwnedPathId {"},{"Add":" parent_inode: item.inode,"},{"Add":" basename: SmallString::new(),"},{"Add":" };"},{"Add":" let mut has_matching_children = false;"},{"Add":" for (fileid_, child_inode) in txn.iter_tree(fileid.clone(), None) {"},{"Add":" if fileid_.parent_inode < fileid.parent_inode || fileid_.basename.is_empty() {"},{"Add":" continue;"},{"Add":" } else if fileid_.parent_inode > fileid.parent_inode {"},{"Add":" break;"},{"Add":" }"},{"Add":" if let Some(comp) = comp {"},{"Add":" if comp != fileid_.basename.as_str() {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":" has_matching_children = true;"},{"Add":" let basename = fileid_.basename.as_str().to_string();"},{"Add":" let full_path = if full_path.is_empty() {"},{"Add":" basename.clone()"},{"Add":" } else {"},{"Add":" full_path.clone() + \"/\" + &basename"},{"Add":" };"},{"Add":" debug!(\"fileid_ {:?} child_inode {:?}\", fileid_, child_inode);"},{"Add":" if let Ok(meta) = working_copy.file_metadata(&full_path) {"},{"Add":" stack.push(RecordItem {"},{"Add":" papa: item.inode,"},{"Add":" inode: child_inode,"},{"Add":" v_papa: vertex,"},{"Add":" basename,"},{"Add":" full_path,"},{"Add":" metadata: meta,"},{"Add":" components: item.components.clone(),"},{"Add":" })"},{"Add":" } else if let Some(vertex) = get_inodes(txn, &channel, child_inode) {"},{"Add":" self.record_deleted_file(txn, &channel, working_copy, &full_path, vertex)"},{"Add":" }"},{"Add":" }"},{"Add":" if comp.is_some() && !has_matching_children {"},{"Add":" return Err((Error::FileNotInRepo {"},{"Add":" path: prefix.to_string(),"},{"Add":" })"},{"Add":" .into());"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"// org id DS+N4kAmqk1FDK+qw7BnysxLa7Ywb9LEvluzB79u6GQ="},{"Add":"fn modified_since_last_commit("},{"Add":" channel: &Channel,"},{"Add":" working_copy: &W,"},{"Add":" prefix: &str,"},{"Add":") -> Result {"},{"Add":" if let Ok(last_modified) = working_copy.modified_time(prefix) {"},{"Add":" debug!("},{"Add":" \"last_modified = {:?}, channel.last = {:?}\","},{"Add":" last_modified"},{"Add":" .duration_since(std::time::UNIX_EPOCH)?"},{"Add":" .as_secs(),"},{"Add":" channel.last_modified"},{"Add":" );"},{"Add":" Ok(last_modified"},{"Add":" .duration_since(std::time::UNIX_EPOCH)?"},{"Add":" .as_secs()"},{"Add":" + 2"},{"Add":" >= channel.last_modified)"},{"Add":" } else {"},{"Add":" Ok(true)"},{"Add":" }"},{"Add":"}"},{"Add":"// org id 5O3+CI2LLrnmA6V30GAG0YsOy5x1t39sAhn6+LHylzs="},{"Add":"impl Builder {"},{"Add":" fn record_moved_file("},{"Add":" &mut self,"},{"Add":" changes: &C,"},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" item: &RecordItem,"},{"Add":" vertex: Position,"},{"Add":" new_papa: Position>,"},{"Add":" old_meta: InodeMetadata,"},{"Add":" ) -> Result<(), anyhow::Error> {"},{"Add":" debug!(\"record_moved_file {:?} {:?}\", item, old_meta);"},{"Add":" // org id svyyji0bEjJBztjFhnSAfxuRFZoPqdU7oYQxF0xrcAI="},{"Add":" let name_start = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" item.metadata.write(&mut self.rec.contents)?;"},{"Add":" self.rec.contents.extend(item.basename.as_bytes());"},{"Add":" let name_end = ChangePosition(self.rec.contents.len() as u64);"},{"Add":" self.rec.contents.push(0);"},{"Add":" let name = &self.rec.contents[name_start.0 as usize..name_end.0 as usize];"},{"Add":" // org id oBZg+v5vsRuJuxenoo+uPc3fskCmXq/VrCY3c5p8Kmw="},{"Add":" let mut moved = collect_moved_edges("},{"Add":" txn,"},{"Add":" changes,"},{"Add":" channel,"},{"Add":" new_papa,"},{"Add":" vertex,"},{"Add":" item.metadata,"},{"Add":" old_meta,"},{"Add":" name,"},{"Add":" )?;"},{"Add":" // org id B5uLQzVsMdND0cJxfZbH11TZxt5E4FHBpjIrnezZ75E="},{"Add":" debug!(\"moved = {:#?}\", moved);"},{"Add":" if !moved.resurrect.is_empty() {"},{"Add":" moved.resurrect.extend(moved.alive.into_iter());"},{"Add":" self.rec.actions.push(Record::FileUndel {"},{"Add":" undel: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: moved.resurrect,"},{"Add":" inode: item.v_papa,"},{"Add":" }),"},{"Add":" contents: None,"},{"Add":" path: item.full_path.clone(),"},{"Add":" });"},{"Add":" }"},{"Add":""},{"Add":" if !moved.edges.is_empty() {"},{"Add":" if moved.need_new_name {"},{"Add":" self.rec.actions.push(Record::FileMove {"},{"Add":" del: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: moved.edges,"},{"Add":" inode: item.v_papa,"},{"Add":" }),"},{"Add":" add: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![item.v_papa],"},{"Add":" down_context: vec![vertex.to_option()],"},{"Add":" start: name_start,"},{"Add":" end: name_end,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" inode: item.v_papa,"},{"Add":" }),"},{"Add":" path: item.full_path.clone(),"},{"Add":" });"},{"Add":" } else {"},{"Add":" self.rec.actions.push(Record::SolveNameConflict {"},{"Add":" name: Atom::EdgeMap(EdgeMap {"},{"Add":" edges: moved.edges,"},{"Add":" inode: item.v_papa,"},{"Add":" }),"},{"Add":" path: item.full_path.clone(),"},{"Add":" });"},{"Add":" self.rec.contents.truncate(name_start.0 as usize)"},{"Add":" }"},{"Add":" } else {"},{"Add":" self.rec.contents.truncate(name_start.0 as usize)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":"// org id RiIULuSdUr3BfIyIj6wuGxhdiPlgaYi8BRJChkI34Y0="},{"Add":"#[derive(Debug)]"},{"Add":"struct MovedEdges {"},{"Add":" edges: Vec>>,"},{"Add":" alive: Vec>>,"},{"Add":" resurrect: Vec>>,"},{"Add":" need_new_name: bool,"},{"Add":"}"},{"Add":""},{"Add":"fn collect_moved_edges("},{"Add":" txn: &T,"},{"Add":" changes: &C,"},{"Add":" channel: &Channel,"},{"Add":" parent_pos: Position>,"},{"Add":" current_pos: Position,"},{"Add":" new_meta: InodeMetadata,"},{"Add":" old_meta: InodeMetadata,"},{"Add":" name: &[u8],"},{"Add":") -> Result {"},{"Add":" debug!(\"collect_moved_edges {:?}\", current_pos);"},{"Add":" let mut moved = MovedEdges {"},{"Add":" edges: Vec::new(),"},{"Add":" alive: Vec::new(),"},{"Add":" resurrect: Vec::new(),"},{"Add":" need_new_name: true,"},{"Add":" };"},{"Add":" let mut del_del = HashMap::new();"},{"Add":" let mut alive = HashMap::new();"},{"Add":" let mut previous_name = Vec::new();"},{"Add":" for parent in txn"},{"Add":" .iter_adjacent("},{"Add":" channel,"},{"Add":" current_pos.inode_vertex(),"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all(),"},{"Add":" )"},{"Add":" .filter(|e| e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT))"},{"Add":" {"},{"Add":" // org id fIIXSike+L92Ume3OTTPmilsrGywr5YQ8AfEvLCP83A="},{"Add":" debug!(\"parent = {:?}\", parent);"},{"Add":" let mut parent_was_resurrected = false;"},{"Add":" if !parent.flag.contains(EdgeFlags::PSEUDO) {"},{"Add":" if parent.flag.contains(EdgeFlags::DELETED) {"},{"Add":" moved.resurrect.push(NewEdge {"},{"Add":" previous: parent.flag - EdgeFlags::PARENT,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" from: parent.dest.to_option(),"},{"Add":" to: current_pos.inode_vertex().to_option(),"},{"Add":" introduced_by: Some(parent.introduced_by),"},{"Add":" });"},{"Add":" parent_was_resurrected = true;"},{"Add":" let v = alive"},{"Add":" .entry((parent.dest, current_pos.inode_vertex()))"},{"Add":" .or_insert(Vec::new());"},{"Add":" v.push(None)"},{"Add":" } else {"},{"Add":" let v = alive"},{"Add":" .entry((parent.dest, current_pos.inode_vertex()))"},{"Add":" .or_insert(Vec::new());"},{"Add":" v.push(Some(parent.introduced_by))"},{"Add":" }"},{"Add":" }"},{"Add":" previous_name.clear();"},{"Add":" let parent_dest = txn.find_block_end(&channel, parent.dest).unwrap();"},{"Add":" changes.get_contents(|p| txn.get_external(p), parent_dest, &mut previous_name)?;"},{"Add":" debug!("},{"Add":" \"parent_dest {:?} {:?}\","},{"Add":" parent_dest,"},{"Add":" std::str::from_utf8(&previous_name[2..])"},{"Add":" );"},{"Add":" debug!(\"new_meta = {:?}, old_meta = {:?}\", new_meta, old_meta);"},{"Add":" let name_changed ="},{"Add":" (&previous_name[2..] != &name[2..]) || (new_meta != old_meta && cfg!(not(windows)));"},{"Add":" for grandparent in txn"},{"Add":" .iter_adjacent("},{"Add":" channel,"},{"Add":" parent_dest,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all(),"},{"Add":" )"},{"Add":" .filter(|e| {"},{"Add":" e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::PARENT)"},{"Add":" && !e.flag.contains(EdgeFlags::PSEUDO)"},{"Add":" })"},{"Add":" {"},{"Add":" // org id aFLJipavvFSV6W0GngE9D67Lu59Fibp/NxOo7S4PfBU="},{"Add":" debug!(\"grandparent: {:?}\", grandparent);"},{"Add":" let grandparent_dest = txn.find_block_end(&channel, grandparent.dest).unwrap();"},{"Add":" assert_eq!(grandparent_dest.start, grandparent_dest.end);"},{"Add":" debug!("},{"Add":" \"grandparent_dest {:?} {:?}\","},{"Add":" grandparent_dest,"},{"Add":" std::str::from_utf8(&previous_name[2..])"},{"Add":" );"},{"Add":" let grandparent_changed = parent_pos != grandparent.dest.to_option();"},{"Add":" debug!(\"change = {:?}\", grandparent_changed || name_changed);"},{"Add":""},{"Add":" if grandparent.flag.contains(EdgeFlags::DELETED) {"},{"Add":" if !grandparent_changed && !name_changed {"},{"Add":" // We resurrect the name"},{"Add":" moved.resurrect.push(NewEdge {"},{"Add":" previous: grandparent.flag - EdgeFlags::PARENT,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" from: grandparent.dest.to_option(),"},{"Add":" to: parent_dest.to_option(),"},{"Add":" introduced_by: Some(grandparent.introduced_by),"},{"Add":" });"},{"Add":" if !parent_was_resurrected && !parent.flag.contains(EdgeFlags::PSEUDO) {"},{"Add":" moved.alive.push(NewEdge {"},{"Add":" previous: parent.flag - EdgeFlags::PARENT,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" from: parent.dest.to_option(),"},{"Add":" to: current_pos.inode_vertex().to_option(),"},{"Add":" introduced_by: Some(parent.introduced_by),"},{"Add":" })"},{"Add":" }"},{"Add":" moved.need_new_name = false"},{"Add":" } else {"},{"Add":" // Clean up the extra deleted edges."},{"Add":" debug!(\"cleanup\");"},{"Add":" let v = del_del"},{"Add":" .entry((grandparent.dest, parent_dest))"},{"Add":" .or_insert(Vec::new());"},{"Add":" v.push(Some(grandparent.introduced_by))"},{"Add":" }"},{"Add":" } else if grandparent_changed || name_changed {"},{"Add":" moved.edges.push(NewEdge {"},{"Add":" previous: parent.flag - EdgeFlags::PARENT,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::DELETED,"},{"Add":" from: grandparent.dest.to_option(),"},{"Add":" to: parent_dest.to_option(),"},{"Add":" introduced_by: Some(grandparent.introduced_by),"},{"Add":" });"},{"Add":" // The following is really important in missing context detection:"},{"Add":" if !parent_was_resurrected && !parent.flag.contains(EdgeFlags::PSEUDO) {"},{"Add":" moved.alive.push(NewEdge {"},{"Add":" previous: parent.flag - EdgeFlags::PARENT,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" from: parent.dest.to_option(),"},{"Add":" to: current_pos.inode_vertex().to_option(),"},{"Add":" introduced_by: Some(parent.introduced_by),"},{"Add":" })"},{"Add":" }"},{"Add":" } else {"},{"Add":" let v = alive"},{"Add":" .entry((grandparent.dest, parent_dest))"},{"Add":" .or_insert(Vec::new());"},{"Add":" v.push(Some(grandparent.introduced_by));"},{"Add":" moved.need_new_name = false"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" for ((from, to), intro) in del_del {"},{"Add":" if intro.len() > 1 {"},{"Add":" for introduced_by in intro {"},{"Add":" if introduced_by.is_some() {"},{"Add":" moved.edges.push(NewEdge {"},{"Add":" previous: EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::DELETED,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::DELETED,"},{"Add":" from: from.to_option(),"},{"Add":" to: to.to_option(),"},{"Add":" introduced_by,"},{"Add":" })"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" for ((from, to), intro) in alive {"},{"Add":" if intro.len() > 1 {"},{"Add":" for introduced_by in intro {"},{"Add":" if introduced_by.is_some() {"},{"Add":" moved.alive.push(NewEdge {"},{"Add":" previous: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" from: from.to_option(),"},{"Add":" to: to.to_option(),"},{"Add":" introduced_by,"},{"Add":" })"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(moved)"},{"Add":"}"},{"Add":"// org id /9wv5iBmVVp4FyMrDp7baUtY5ISICj5WK9XyO8OC7T4="},{"Add":"impl Builder {"},{"Add":" fn record_deleted_file("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" channel: &Channel

…

Dependencies

Change contents