{"header":{"message":"Adding an untracked change iterator","description":null,"timestamp":"2021-07-11T21:03:18.422320335Z","authors":[{}]},"hash":"HSEYMLO2DJCDGBO4F7T6NFMFSZ4TMSOBH5XGIU5NYOEFKUSV5UKAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["HSEYMLO2DJCDGBO4F7T6NFMFSZ4TMSOBH5XGIU5NYOEFKUSV5UKAC","Adding an untracked change iterator"],["AA",null],["VSTBTRYEZOZPPEIBDFVF2WQKPOJBZTS77SOZVDBPR2IKFHH67U5AC","Fixing a compilation error"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","Using path-slash to fix path issues on Windows"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","Optional colours in the global config file"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["YDKNUL6B4EFM5U2GG36SSEKXHS6XK4OLIWUVE4BUAJ5VYJFHAOIQC","Add `diff --short` that lists changes without showing them"],["G7VOM2IMN4SOHOOCFLMNPKTU5DB5EEJMK7SSBA3DLWWXFA672RUAC","Returning an error when recording non-existent paths"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","Correct handling of ignore files"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","commands: set up pager for diff, change, and credit"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["3J6IK4W2BA4RJJQYXZOQFU4AQ3WJIM3TUXUNNBIQ6M6TS2JSHT6QC","Explicitly adding .pijul is now forbidden"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","A few fixes in the documentation comments"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"]],"deps":["VSTBTRYEZOZPPEIBDFVF2WQKPOJBZTS77SOZVDBPR2IKFHH67U5AC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","YDKNUL6B4EFM5U2GG36SSEKXHS6XK4OLIWUVE4BUAJ5VYJFHAOIQC","VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","4VWXL6KQGYGDUQRCVJCEVIV6CKJSEIYDX4YF33OX6EDNKJNEGD2AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","3J6IK4W2BA4RJJQYXZOQFU4AQ3WJIM3TUXUNNBIQ6M6TS2JSHT6QC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","G7VOM2IMN4SOHOOCFLMNPKTU5DB5EEJMK7SSBA3DLWWXFA672RUAC","V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":144,"ins":{"up_context":[{"change":4,"pos":137}],"down_context":[{"change":4,"pos":170}],"flag":"BLOCK","start":41,"end":67,"inode":{"change":4,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":137},"to":{"change":4,"start":137,"end":170},"introduced_by":4}],"inode":{"change":4,"pos":169058}},"ins_contents":[{"Add":" &txn,"}],"del_contents":[{"Del":" txn.clone(),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":8,"ins":{"up_context":[{"change":4,"pos":2595}],"down_context":[{"change":4,"pos":2654}],"flag":"BLOCK","start":68,"end":108,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2595},"to":{"change":4,"start":3029,"end":3060},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":"use libpijul::{MutTxnT, TxnT, TxnTExt};"}],"del_contents":[{"Del":"use libpijul::{MutTxnT, TxnT};\n"}]}},{"Edit":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":30,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":49}],"down_context":[{"change":28,"pos":3165}],"flag":"BLOCK","start":109,"end":202,"inode":{"change":4,"pos":173551}}},"contents":[{"Add":" /// Include the untracked files"},{"Add":" #[clap(long = \"untracked\")]"},{"Add":" pub untracked: bool,"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":112,"ins":{"up_context":[{"change":4,"pos":175800}],"down_context":[{"change":4,"pos":176894}],"flag":"BLOCK","start":203,"end":1884,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":175800},"to":{"change":4,"start":175800,"end":175893},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":175893},"to":{"change":4,"start":628,"end":817},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":817},"to":{"change":4,"start":0,"end":824},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":824},"to":{"change":4,"start":1663,"end":1755},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1663},"to":{"change":4,"start":1663,"end":1755},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" if self.untracked {"},{"Add":" serde_json::to_writer_pretty("},{"Add":" &mut std::io::stdout(),"},{"Add":" &untracked(&repo, &*txn)?.collect::>(),"},{"Add":" )?;"},{"Add":" writeln!(stdout)?;"},{"Add":" } else {"},{"Add":" let mut changes = BTreeMap::new();"},{"Add":" for ch in change.changes.iter() {"},{"Add":" changes"},{"Add":" .entry(ch.path())"},{"Add":" .or_insert_with(Vec::new)"},{"Add":" .push(Status {"},{"Add":" operation: match ch {"},{"Add":" Hunk::FileMove { .. } => \"file move\","},{"Add":" Hunk::FileDel { .. } => \"file del\","},{"Add":" Hunk::FileUndel { .. } => \"file undel\","},{"Add":" Hunk::SolveNameConflict { .. } => \"solve name conflict\","},{"Add":" Hunk::UnsolveNameConflict { .. } => \"unsolve name conflict\","},{"Add":" Hunk::FileAdd { .. } => \"file add\","},{"Add":" Hunk::Edit { .. } => \"edit\","},{"Add":" Hunk::Replacement { .. } => \"replacement\","},{"Add":" Hunk::SolveOrderConflict { .. } => \"solve order conflict\","},{"Add":" Hunk::UnsolveOrderConflict { .. } => \"unsolve order conflict\","},{"Add":" Hunk::ResurrectZombies { .. } => \"resurrect zombies\","},{"Add":" },"},{"Add":" line: ch.line(),"},{"Add":" });"},{"Add":" }"},{"Add":" serde_json::to_writer_pretty(&mut std::io::stdout(), &changes)?;"},{"Add":" writeln!(stdout)?;"}],"del_contents":[{"Del":" let mut changes = BTreeMap::new();\n for ch in change.changes.iter() {\n"},{"Del":" changes\n .entry(ch.path())\n .or_insert_with(Vec::new)\n .push(Status {\n operation: match ch {\n"},{"Del":" Hunk::FileMove { .. } => \"file move\",\n Hunk::FileDel { .. } => \"file del\",\n Hunk::FileUndel { .. } => \"file undel\",\n Hunk::SolveNameConflict { .. } => \"solve name conflict\",\n Hunk::UnsolveNameConflict { .. } => \"unsolve name conflict\",\n Hunk::FileAdd { .. } => \"file add\",\n Hunk::Edit { .. } => \"edit\",\n Hunk::Replacement { .. } => \"replacement\",\n Hunk::SolveOrderConflict { .. } => \"solve order conflict\",\n Hunk::UnsolveOrderConflict { .. } => \"unsolve order conflict\",\n Hunk::ResurrectZombies { .. } => \"resurrect zombies\",\n"},{"Del":" },\n line: ch.line(),\n });\n"}]}},{"Edit":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":144,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":176908},"to":{"change":4,"start":176908,"end":176985},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":176985},"to":{"change":4,"start":1756,"end":1787},"introduced_by":4}],"inode":{"change":4,"pos":173551}}},"contents":[{"Del":" serde_json::to_writer_pretty(&mut std::io::stdout(), &changes)?;\n"},{"Del":" writeln!(stdout)?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":180,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":45}],"down_context":[{"change":4,"pos":5627}],"flag":"BLOCK","start":1885,"end":2018,"inode":{"change":4,"pos":173551}}},"contents":[{"Add":" }"},{"Add":" for path in untracked(&repo, &*txn)? {"},{"Add":" writeln!(stdout, \"U {}\", path.to_str().unwrap())?;"}]}},{"Edit":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":184,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5641}],"down_context":[{"change":4,"pos":177020}],"flag":"BLOCK","start":2019,"end":2184,"inode":{"change":4,"pos":173551}}},"contents":[{"Add":" } else if self.untracked {"},{"Add":" for path in untracked(&repo, &*txn)? {"},{"Add":" writeln!(stdout, \"{}\", path.to_str().unwrap())?;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":306,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":951}],"down_context":[{"change":4,"pos":177744}],"flag":"BLOCK","start":2185,"end":3019,"inode":{"change":4,"pos":173551}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn untracked<'a, T: TxnTExt>("},{"Add":" repo: &Repository,"},{"Add":" txn: &'a T,"},{"Add":") -> Result + 'a, anyhow::Error> {"},{"Add":" let repo_path = CanonicalPathBuf::canonicalize(&repo.path)?;"},{"Add":" let threads = num_cpus::get();"},{"Add":" Ok(repo"},{"Add":" .working_copy"},{"Add":" .iterate_prefix_rec(repo_path.clone(), repo_path.clone(), threads)?"},{"Add":" .filter_map(move |x| {"},{"Add":" let (path, _) = x.unwrap();"},{"Add":" let path_ = if let Ok(path) = path.as_path().strip_prefix(&repo_path.as_path()) {"},{"Add":" path"},{"Add":" } else {"},{"Add":" return None;"},{"Add":" };"},{"Add":" use path_slash::PathExt;"},{"Add":" let path_str = path_.to_slash_lossy();"},{"Add":" if !txn.is_tracked(&path_str).unwrap() {"},{"Add":" Some(path)"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" }))"}]}},{"Edit":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":87,"atom":{"NewVertex":{"up_context":[{"change":29,"pos":3771}],"down_context":[{"change":29,"pos":3771}],"flag":"BLOCK","start":3020,"end":3610,"inode":{"change":4,"pos":208900}}},"contents":[{"Add":" #[error(transparent)]"},{"Add":" Txn(#[from] T),"},{"Add":"}"},{"Add":""},{"Add":"pub struct Untracked {"},{"Add":" join: Option>>,"},{"Add":" receiver: std::sync::mpsc::Receiver<(PathBuf, bool)>,"},{"Add":"}"},{"Add":""},{"Add":"impl Iterator for Untracked {"},{"Add":" type Item = Result<(PathBuf, bool), std::io::Error>;"},{"Add":" fn next(&mut self) -> Option {"},{"Add":" if let Ok(x) = self.receiver.recv() {"},{"Add":" return Some(Ok(x));"},{"Add":" } else if let Some(j) = self.join.take() {"},{"Add":" if let Ok(Err(e)) = j.join() {"},{"Add":" return Some(Err(e));"},{"Add":" }"},{"Add":" }"},{"Add":" None"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":164,"ins":{"up_context":[{"change":4,"pos":1702}],"down_context":[{"change":4,"pos":1756}],"flag":"BLOCK","start":3611,"end":3636,"inode":{"change":4,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1702},"to":{"change":3,"start":758,"end":782},"introduced_by":3}],"inode":{"change":4,"pos":208900}},"ins_contents":[{"Add":" txn: &ArcTxn,"}],"del_contents":[{"Del":" txn: ArcTxn,\n"}]}},{"Edit":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":170,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":19679}],"down_context":[{"change":4,"pos":1935}],"flag":"BLOCK","start":3637,"end":4346,"inode":{"change":4,"pos":208900}}},"contents":[{"Add":" let mut txn = txn.write();"},{"Add":" for p in self.iterate_prefix_rec(repo_path.clone(), full.clone(), threads)? {"},{"Add":" let (path, is_dir) = p?;"},{"Add":" info!(\"Adding {:?}\", path);"},{"Add":" use path_slash::PathExt;"},{"Add":" let path_str = path.to_slash_lossy();"},{"Add":" match txn.add(&path_str, is_dir, salt) {"},{"Add":" Ok(()) => {}"},{"Add":" Err(crate::fs::FsError::AlreadyInRepo(_)) => {}"},{"Add":" Err(e) => return Err(e.into()),"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn iterate_prefix_rec("},{"Add":" &self,"},{"Add":" repo_path: CanonicalPathBuf,"},{"Add":" full: CanonicalPathBuf,"},{"Add":" threads: usize,"},{"Add":" ) -> Result {"}]}},{"Replacement":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":202,"ins":{"up_context":[{"change":4,"pos":268}],"down_context":[{"change":4,"pos":175}],"flag":"BLOCK","start":4347,"end":4451,"inode":{"change":4,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":268},"to":{"change":4,"start":268,"end":295},"introduced_by":4}],"inode":{"change":4,"pos":208900}},"ins_contents":[{"Add":" return Ok(Untracked {"},{"Add":" join: None,"},{"Add":" receiver,"},{"Add":" });"}],"del_contents":[{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":207,"ins":{"up_context":[{"change":4,"pos":185}],"down_context":[{"change":4,"pos":186}],"flag":"BLOCK","start":4452,"end":4527,"inode":{"change":4,"pos":208900}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":185},"to":{"change":4,"start":19680,"end":19764},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1902},"to":{"change":4,"start":19680,"end":19764},"introduced_by":4}],"inode":{"change":4,"pos":208900}},"ins_contents":[{"Add":" let t = std::thread::spawn(move || -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" let t = std::thread::spawn(move || -> Result<(), AddError> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":254,"ins":{"up_context":[{"change":4,"pos":2857}],"down_context":[{"change":4,"pos":210945}],"flag":"BLOCK","start":4528,"end":4611,"inode":{"change":4,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2857},"to":{"change":4,"start":2857,"end":2858},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2858},"to":{"change":3,"start":783,"end":818},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":818},"to":{"change":4,"start":2858,"end":2955},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":4,"pos":28110},"to":{"change":4,"start":2858,"end":2955},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2858},"to":{"change":4,"start":2858,"end":2955},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2955},"to":{"change":4,"start":1036,"end":1123},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1123},"to":{"change":4,"start":1895,"end":1948},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1170},"to":{"change":4,"start":1988,"end":2143},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1948},"to":{"change":4,"start":1988,"end":2143},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1988},"to":{"change":4,"start":1988,"end":2143},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":2143},"to":{"change":4,"start":3045,"end":3105},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3045},"to":{"change":4,"start":3045,"end":3105},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1570},"to":{"change":4,"start":210920,"end":210945},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":3105},"to":{"change":4,"start":210920,"end":210945},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":3735},"to":{"change":4,"start":210920,"end":210945},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":210920},"to":{"change":4,"start":210920,"end":210945},"introduced_by":4}],"inode":{"change":4,"pos":208900}},"ins_contents":[{"Add":" Ok(Untracked {"},{"Add":" join: Some(t),"},{"Add":" receiver,"},{"Add":" })"}],"del_contents":[{"Del":"\n"},{"Del":" let mut txn = txn.write();\n"},{"Del":" while let Ok((path, is_dir)) = receiver.recv() {\n info!(\"Adding {:?}\", path);\n"},{"Del":" use path_slash::PathExt;\n let path_str = path.to_slash_lossy();\n"},{"Del":" match txn.add(&path_str, is_dir, salt) {\n"},{"Del":" Ok(()) => {}\n Err(crate::fs::FsError::AlreadyInRepo(_)) => {}\n Err(e) => return Err(e.into()),\n }\n"},{"Del":" }\n\n if let Ok(t) = t.join() {\n t?\n"},{"Del":" }\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":4,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":278,"ins":{"up_context":[{"change":4,"pos":390}],"down_context":[{"change":4,"pos":459}],"flag":"BLOCK","start":4612,"end":5042,"inode":{"change":4,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":390},"to":{"change":4,"start":1969,"end":2044},"introduced_by":4}],"inode":{"change":4,"pos":208900}},"ins_contents":[{"Add":" {"},{"Add":" let path = if let Ok(path) = full.as_path().strip_prefix(&repo_path.as_path()) {"},{"Add":" path"},{"Add":" } else {"},{"Add":" return Ok(());"},{"Add":" };"},{"Add":" use path_slash::PathExt;"},{"Add":" let path_str = path.to_slash_lossy();"},{"Add":" if !txn.read().is_tracked(&path_str)? {"},{"Add":" self.add_prefix_rec(&txn, repo_path, full, threads, salt)?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" self.add_prefix_rec(txn.clone(), repo_path, full, threads, salt)?;\n"}]}},{"FileAdd":{"meta":{"basename":".ignore","metadata":0},"context":[{"change":1,"pos":0}],"contents":[{"Add":"target"}]}}],"owner":"irevoire","repo":"pijul","token":"rTxzHx7UwZ+FEWkaaMu6/Cs5D62Eb6ucUvhQsSr4NMQ=","login":null}

…

Dependencies

Change contents