{"header":{"message":"Import Git repos without writing anything to disk","description":null,"timestamp":"2022-10-12T11:42:17.829607696Z","authors":[{}]},"hash":"RP7YRM5QOINW7FB5BGNZEXVQN7TXB7LLLHXZPPAI6DGFGRP7JPFQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["RP7YRM5QOINW7FB5BGNZEXVQN7TXB7LLLHXZPPAI6DGFGRP7JPFQC","Import Git repos without writing anything to disk"],["AA",null],["5DUMO2ICSN2WFFYHREJUHA3VNRX7QAXZVQAQI2O7ZMXYXOC5SUGAC","Better `pijul git` error message (when recording)"],["3SJ3DJNFDA665FS5RLD3HA5S2RKMB5GTA56MBF77YSOPCOHTFMYAC","Adding a --force option to `pijul add`, to include otherwise ignored files"],["UC5C5REV3W3KPY45FFZWSZYLP7BCGK54Z5N74RSF26ZTC3HAC2QQC","`pijul git`: two more fields in the benchmarks"],["XFYALEYNPVBGT6ET2LT2QKBM4C5MFTIQKABOU3VQJLAYEWMJM22QC","When importing initial Git commits, use walk rather than iter to walk the tree"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["46XERN6R4LPZLWEPUBSTGCKPOBGMCMHPVUKRUC55OWLBVJCUVNUQC","Fixing \"addition error\" in `pijul git`"],["YVA72CP2DB5XDKML3HR6NLB2GNPN5PXCGZD6DVXZGLAUEB3W4TGAC","Default feedback for the `pijul git` command"],["LOJL4HMYG7EOVZ5MSMCORDLDSRHWO2JPHMOTLMLQA7GPJNSVDXOQC","Recording a prefix we just deleted (mostly useful in `pijul git`, regular records returned NotFound)"],["S7MPXAPHFSUUUUDEDGGUHOJXMEPYCWKYEVK4FVWQLRJLXGBQ4MRQC","Removing warnings in pijul::commands::git"],["SFY4U6XENPS67BWNMTZI472WBORGVL7B4FZDIHGHEJQR5VYRYCVAC","remove redundant conditional compilation"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","Fixing `pijul git`"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","Upgrading to Clap 3.0.0-alpha.5"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","use native external subcommand support instead of hand-rolled one"],["YGPEHOTED5UG3IUK263PIX566VEHM3KYHPYIXZHPJ4ICHXWZEUJAC","libpijul::fs::add_{file,dir} now return the created Inode"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["VU4KVXHWMLZCJJDO3DDUTNTYUDCDD7RSJ3QJ67EMNZV44H2YIKSAC","Git import was importing parents and hidden files (including .git), in some cases"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","Deterministic Git import"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","Using path-slash to fix path issues on Windows"],["LCERQSWMA2YKOPAPNZUSOQ7FLBGDHBZR33OHLYX7T4KTKULRMJDQC","Cleanup"]],"deps":["5DUMO2ICSN2WFFYHREJUHA3VNRX7QAXZVQAQI2O7ZMXYXOC5SUGAC","3SJ3DJNFDA665FS5RLD3HA5S2RKMB5GTA56MBF77YSOPCOHTFMYAC","UC5C5REV3W3KPY45FFZWSZYLP7BCGK54Z5N74RSF26ZTC3HAC2QQC","XFYALEYNPVBGT6ET2LT2QKBM4C5MFTIQKABOU3VQJLAYEWMJM22QC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","SFY4U6XENPS67BWNMTZI472WBORGVL7B4FZDIHGHEJQR5VYRYCVAC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","VU4KVXHWMLZCJJDO3DDUTNTYUDCDD7RSJ3QJ67EMNZV44H2YIKSAC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","46XERN6R4LPZLWEPUBSTGCKPOBGMCMHPVUKRUC55OWLBVJCUVNUQC","YVA72CP2DB5XDKML3HR6NLB2GNPN5PXCGZD6DVXZGLAUEB3W4TGAC","YGPEHOTED5UG3IUK263PIX566VEHM3KYHPYIXZHPJ4ICHXWZEUJAC","PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","LOJL4HMYG7EOVZ5MSMCORDLDSRHWO2JPHMOTLMLQA7GPJNSVDXOQC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","S7MPXAPHFSUUUUDEDGGUHOJXMEPYCWKYEVK4FVWQLRJLXGBQ4MRQC"]},"hunks":[{"Replacement":{"inode":{"change":6,"pos":83981},"path":"pijul/src/main.rs","line":140,"ins":{"up_context":[{"change":6,"pos":20}],"down_context":[{"change":6,"pos":100}],"flag":"BLOCK","start":0,"end":106,"inode":{"change":6,"pos":83981}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20},"to":{"change":6,"start":29,"end":52},"introduced_by":6}],"inode":{"change":6,"pos":83981}},"ins_contents":[{"Add":" if cfg!(debug_assertions) {"},{"Add":" env_logger::init();"},{"Add":" } else {"},{"Add":" env_logger_init();"},{"Add":" }"}],"del_contents":[{"Del":" env_logger_init();\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":819},"to":{"change":6,"start":819,"end":857},"introduced_by":6}],"inode":{"change":6,"pos":137210}}},"contents":[{"Del":"use canonical_path::CanonicalPathBuf;\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":970},"to":{"change":6,"start":137281,"end":137305},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":137281},"to":{"change":6,"start":137281,"end":137305},"introduced_by":6}],"inode":{"change":6,"pos":137210}}},"contents":[{"Del":"use std::cell::RefCell;\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":137419},"to":{"change":6,"start":137419,"end":137436},"introduced_by":6}],"inode":{"change":6,"pos":137210}}},"contents":[{"Del":"use std::rc::Rc;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":444,"ins":{"up_context":[{"change":6,"pos":2635}],"down_context":[{"change":6,"pos":151374}],"flag":"BLOCK","start":107,"end":152,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2635},"to":{"change":6,"start":14259,"end":14296},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" &libpijul::working_copy::sink(),"}],"del_contents":[{"Del":" &repo.repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":482,"ins":{"up_context":[{"change":6,"pos":152146}],"down_context":[{"change":6,"pos":152214}],"flag":"BLOCK","start":153,"end":227,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152146},"to":{"change":6,"start":152146,"end":152214},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":") -> Result<(git2::Object<'a>, BTreeMap), anyhow::Error> {"}],"del_contents":[{"Del":") -> Result<(git2::Object<'a>, BTreeSet), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":487,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152395},"to":{"change":6,"start":152395,"end":153092},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":153092},"to":{"change":6,"start":0,"end":84},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":84},"to":{"change":6,"start":153092,"end":153321},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":153092},"to":{"change":6,"start":153092,"end":153321},"introduced_by":6}],"inode":{"change":6,"pos":137210}}},"contents":[{"Del":" let reset_was_useful = Rc::new(RefCell::new(false));\n let mut builder = git2::build::CheckoutBuilder::new();\n let repo_path = repo.repo.path.clone();\n let reset_was_useful_ = reset_was_useful.clone();\n builder\n .force()\n .remove_untracked(true)\n .remove_ignored(true)\n .progress(move |file, a, b| {\n debug!(\"Git progress: {:?} {:?} {:?}\", file, a, b);\n if let Some(file) = file {\n let file = repo_path.join(file);\n if let Ok(meta) = std::fs::metadata(&file) {\n if !meta.file_type().is_symlink() {\n *reset_was_useful_.borrow_mut() = true\n }\n"},{"Del":" } else {\n *reset_was_useful_.borrow_mut() = true\n"},{"Del":" }\n }\n });\n builder.notify(|notif, file, _, _, _| {\n info!(\"Git reset: {:?} {:?}\", notif, file);\n true\n });\n git.reset(&object, git2::ResetType::Hard, Some(&mut builder))?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":491,"ins":{"up_context":[{"change":6,"pos":153433}],"down_context":[{"change":6,"pos":153473}],"flag":"BLOCK","start":228,"end":268,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":153433},"to":{"change":6,"start":153433,"end":153473},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let mut prefixes = BTreeMap::new();"}],"del_contents":[{"Del":" let mut prefixes = BTreeSet::new();\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":511,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":154151}],"down_context":[{"change":6,"pos":154151}],"flag":"BLOCK","start":269,"end":347,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let is_dir = delta.new_file().mode() == git2::FileMode::Tree;"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":551,"ins":{"up_context":[{"change":6,"pos":156162}],"down_context":[{"change":6,"pos":156213}],"flag":"BLOCK","start":348,"end":407,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156162},"to":{"change":6,"start":156162,"end":156213},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" prefixes.insert(new_path, is_dir);"}],"del_contents":[{"Del":" prefixes.insert(new_path);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":555,"ins":{"up_context":[{"change":6,"pos":156344}],"down_context":[{"change":6,"pos":156395}],"flag":"BLOCK","start":408,"end":467,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156344},"to":{"change":6,"start":156344,"end":156395},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" prefixes.insert(old_path, is_dir);"}],"del_contents":[{"Del":" prefixes.insert(old_path);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":562,"ins":{"up_context":[{"change":6,"pos":156742}],"down_context":[{"change":6,"pos":156852}],"flag":"BLOCK","start":468,"end":594,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156742},"to":{"change":6,"start":156742,"end":156852},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" prefixes.insert(old_path, is_dir);"},{"Add":" prefixes.insert(new_path, is_dir);"}],"del_contents":[{"Del":" prefixes.insert(old_path);\n prefixes.insert(new_path);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":583,"ins":{"up_context":[{"change":5,"pos":335}],"down_context":[{"change":5,"pos":379}],"flag":"BLOCK","start":595,"end":681,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":335},"to":{"change":5,"start":335,"end":379},"introduced_by":5}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" prefixes.insert(m, t.kind() == Some(git2::ObjectType::Tree));"}],"del_contents":[{"Del":" prefixes.insert(m);\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":593,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":157466}],"down_context":[{"change":6,"pos":157466}],"flag":"BLOCK","start":682,"end":776,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone)]"},{"Add":"struct Commit<'a> {"},{"Add":" r: &'a git2::Repository,"},{"Add":" c: git2::Commit<'a>,"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":600,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":157468}],"down_context":[{"change":6,"pos":157468}],"flag":"BLOCK","start":777,"end":1517,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":""},{"Add":"impl<'a> libpijul::working_copy::WorkingCopyRead for Commit<'a> {"},{"Add":" type Error = git2::Error;"},{"Add":""},{"Add":" fn file_metadata(&self, file: &str) -> Result {"},{"Add":" debug!(\"metadata {:?}\", file);"},{"Add":" let entry = self.c.tree()?.get_path(Path::new(file))?;"},{"Add":" let is_dir = entry.kind() == Some(git2::ObjectType::Tree);"},{"Add":" if is_dir {"},{"Add":" Ok(InodeMetadata::new(0o100, true))"},{"Add":" } else {"},{"Add":" let permissions = entry.filemode();"},{"Add":" debug!("},{"Add":" \"permissions = {:o} {:o} {:?}\","},{"Add":" permissions,"},{"Add":" permissions & 0o100,"},{"Add":" is_dir"},{"Add":" );"},{"Add":" Ok(InodeMetadata::new(permissions as usize & 0o100, false))"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":622,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":157469}],"down_context":[{"change":6,"pos":157469}],"flag":"BLOCK","start":1518,"end":2024,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), Self::Error> {"},{"Add":" debug!(\"read file {:?}\", file);"},{"Add":" let entry = self.c.tree()?.get_path(Path::new(file))?;"},{"Add":" if let Ok(b) = entry.to_object(self.r)?.peel_to_blob() {"},{"Add":" buffer.extend(b.content());"},{"Add":" }"},{"Add":" debug!(\"entry {:?}\", entry.kind());"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn modified_time(&self, _: &str) -> Result {"},{"Add":" Ok(std::time::SystemTime::now())"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":650,"ins":{"up_context":[{"change":6,"pos":14809}],"down_context":[{"change":6,"pos":158068}],"flag":"BLOCK","start":2025,"end":2931,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":3493},"to":{"change":6,"start":157898,"end":157976},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":14809},"to":{"change":6,"start":157898,"end":157976},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157898},"to":{"change":6,"start":157898,"end":157976},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157976},"to":{"change":6,"start":453,"end":530},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":530},"to":{"change":6,"start":157976,"end":158004},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157976},"to":{"change":6,"start":157976,"end":158004},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158004},"to":{"change":6,"start":0,"end":63},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let mut prefixes_ = BTreeMap::new();"},{"Add":" for (mut p, is_dir) in prefixes {"},{"Add":" use path_slash::PathExt;"},{"Add":" loop {"},{"Add":" debug!(\"p = {:?}\", p);"},{"Add":" if prefixes_.contains_key(&p) {"},{"Add":" break;"},{"Add":" }"},{"Add":" let p_ = p.to_slash_lossy();"},{"Add":" debug!(\"adding prefix {:?}\", p_);"},{"Add":" let (tracked, pos) = libpijul::fs::get_vertex(&*txn_, &p_)?;"},{"Add":" if !tracked {"},{"Add":" debug!(\"not tracked\");"},{"Add":" if is_dir {"},{"Add":" txn_.add_dir(&p_, 0).map(|_| ()).unwrap_or(());"},{"Add":" } else {"},{"Add":" txn_.add_file(&p_, 0).map(|_| ()).unwrap_or(());"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"pos = {:?}\", pos);"},{"Add":" if pos.is_none() || !is_dir {"},{"Add":" if !p.pop() {"},{"Add":" prefixes_.insert(PathBuf::new(), true);"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" for p in prefixes.iter() {\n if let Ok(m) = std::fs::metadata(&p) {\n"},{"Del":" use path_slash::PathExt;\n let p = p.to_slash_lossy();\n"},{"Del":" if m.is_dir() {\n"},{"Del":" txn_.add_dir(&p, 0).map(|_| ()).unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":676,"ins":{"up_context":[{"change":6,"pos":158089}],"down_context":[{"change":6,"pos":158154}],"flag":"BLOCK","start":2932,"end":3000,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158089},"to":{"change":6,"start":64,"end":128},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" prefixes_.insert(p, is_dir);"},{"Add":" break;"}],"del_contents":[{"Del":" txn_.add_file(&p, 0).map(|_| ()).unwrap_or(());\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":686,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158402},"to":{"change":6,"start":158402,"end":158463},"introduced_by":6}],"inode":{"change":6,"pos":137210}}},"contents":[{"Del":" let prefix_vec: Vec<_> = prefixes.into_iter().collect();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":711,"ins":{"up_context":[{"change":6,"pos":14912}],"down_context":[{"change":6,"pos":158558}],"flag":"BLOCK","start":3001,"end":3126,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14912},"to":{"change":6,"start":14912,"end":14945},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" // &repo.repo.working_copy"},{"Add":" &Commit {"},{"Add":" r: git,"},{"Add":" c: git.find_commit(*child)?,"},{"Add":" },"}],"del_contents":[{"Del":" &repo.repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":717,"ins":{"up_context":[{"change":6,"pos":158586}],"down_context":[{"change":6,"pos":158632}],"flag":"BLOCK","start":3127,"end":3147,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158586},"to":{"change":6,"start":199,"end":258},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":258},"to":{"change":6,"start":158611,"end":158632},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158611},"to":{"change":6,"start":158611,"end":158632},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" &prefixes_,"}],"del_contents":[{"Del":" &CanonicalPathBuf::canonicalize(&repo.repo.path)?,\n"},{"Del":" &prefix_vec,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":763,"ins":{"up_context":[{"change":6,"pos":1494}],"down_context":[{"change":6,"pos":1622}],"flag":"BLOCK","start":3148,"end":3291,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1494},"to":{"change":6,"start":1494,"end":1622},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" T: TxnT + TxnTExt + MutTxnTExt,"},{"Add":" C: libpijul::changestore::ChangeStore + Clone,"},{"Add":" W: libpijul::working_copy::WorkingCopyRead + Clone,"}],"del_contents":[{"Del":" T: TxnT + TxnTExt + MutTxnTExt + Send + Sync + 'static,\n C: libpijul::changestore::ChangeStore + Clone + Send + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":769,"ins":{"up_context":[{"change":6,"pos":15323}],"down_context":[{"change":6,"pos":160570}],"flag":"BLOCK","start":3292,"end":3314,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":15323},"to":{"change":6,"start":15323,"end":15378},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" working_copy: &W,"}],"del_contents":[{"Del":" working_copy: &libpijul::working_copy::FileSystem,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":771,"ins":{"up_context":[{"change":6,"pos":160587}],"down_context":[{"change":6,"pos":160635}],"flag":"BLOCK","start":3315,"end":3355,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160587},"to":{"change":6,"start":259,"end":293},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":293},"to":{"change":6,"start":160609,"end":160635},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160609},"to":{"change":6,"start":160609,"end":160635},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" prefixes: &BTreeMap,"}],"del_contents":[{"Del":" repo_path: &CanonicalPathBuf,\n"},{"Del":" prefixes: &[PathBuf],\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":774,"ins":{"up_context":[{"change":4,"pos":39}],"down_context":[{"change":6,"pos":85}],"flag":"BLOCK","start":3356,"end":3480,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":39},"to":{"change":6,"start":7303,"end":7398},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160679},"to":{"change":6,"start":7303,"end":7398},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":") -> Result<(usize, Option, libpijul::Merkle), libpijul::LocalApplyError>"},{"Add":"where"},{"Add":" W::Error: 'static,"},{"Add":"{"}],"del_contents":[{"Del":") -> Result<(usize, Option, libpijul::Merkle), libpijul::LocalApplyError> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":781,"ins":{"up_context":[{"change":6,"pos":160881}],"down_context":[{"change":6,"pos":668}],"flag":"BLOCK","start":3481,"end":3641,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160881},"to":{"change":6,"start":34,"end":70},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":70},"to":{"change":6,"start":0,"end":269},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269},"to":{"change":3,"start":24,"end":43},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":43},"to":{"change":6,"start":269,"end":606},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269},"to":{"change":6,"start":269,"end":606},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":606},"to":{"change":2,"start":0,"end":57},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let mut last = None;"},{"Add":" for (p, _) in prefixes.iter() {"},{"Add":" if let Some(last) = last {"},{"Add":" if p.starts_with(&last) {"},{"Add":" continue;"}],"del_contents":[{"Del":" let num_cpus = num_cpus::get();\n"},{"Del":" for p in prefixes.iter() {\n use libpijul::working_copy::filesystem::*;\n match working_copy.record_prefix(\n txn.clone(),\n channel.clone(),\n changes,\n &mut state,\n repo_path.clone(),\n p,\n"},{"Del":" false,\n"},{"Del":" num_cpus,\n 0,\n ) {\n Ok(_) => {}\n Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}\n Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}\n Err(Error::Add(AddError::Io(e))) if e.kind() == std::io::ErrorKind::NotFound => {}\n Err(e) => {\n"},{"Del":" error!(\"While adding {:?}: {:?}\", p, e);\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":788,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":692}],"down_context":[{"change":6,"pos":692}],"flag":"BLOCK","start":3642,"end":4023,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" state"},{"Add":" .record_single_thread("},{"Add":" txn.clone(),"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" false,"},{"Add":" &libpijul::DEFAULT_SEPARATOR,"},{"Add":" channel.clone(),"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" p.to_str().unwrap(),"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" last = Some(p);"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":803,"ins":{"up_context":[{"change":6,"pos":727}],"down_context":[{"change":6,"pos":559}],"flag":"BLOCK","start":4024,"end":4364,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":727},"to":{"change":6,"start":727,"end":977},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":977},"to":{"change":3,"start":44,"end":63},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":63},"to":{"change":6,"start":977,"end":1314},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":977},"to":{"change":6,"start":977,"end":1314},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1314},"to":{"change":2,"start":58,"end":122},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":122},"to":{"change":6,"start":1376,"end":1390},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1376},"to":{"change":6,"start":1376,"end":1390},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1390},"to":{"change":6,"start":549,"end":559},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4996},"to":{"change":6,"start":549,"end":559},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":549},"to":{"change":6,"start":549,"end":559},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" state"},{"Add":" .record_single_thread("},{"Add":" txn.clone(),"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" false,"},{"Add":" &libpijul::DEFAULT_SEPARATOR,"},{"Add":" channel.clone(),"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" use libpijul::working_copy::filesystem::*;\n match working_copy.record_prefix(\n txn.clone(),\n channel.clone(),\n changes,\n &mut state,\n repo_path.clone(),\n Path::new(\"\"),\n"},{"Del":" false,\n"},{"Del":" num_cpus,\n 0,\n ) {\n Ok(_) => {}\n Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}\n Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}\n Err(Error::Add(AddError::Io(e))) if e.kind() == std::io::ErrorKind::NotFound => {}\n Err(e) => {\n"},{"Del":" error!(\"While adding {:?}: {:?}\", prefixes, e);\n"},{"Del":" }\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":6,"pos":737429},"path":"libpijul/src/fs.rs","line":166,"atom":{"NewVertex":{"up_context":[{"change":34,"pos":9}],"down_context":[{"change":6,"pos":741561}],"flag":"BLOCK","start":4365,"end":4882,"inode":{"change":6,"pos":737429}}},"contents":[{"Add":"/// Returns whether a path is registered in the working copy."},{"Add":"pub fn get_vertex("},{"Add":" txn: &T,"},{"Add":" path: &str,"},{"Add":") -> Result<(bool, Option>), TreeErr> {"},{"Add":" debug!(\"is_tracked {:?}\", path);"},{"Add":" let (inode, mut remaining_path_components) = closest_in_repo_ancestor(txn, path)?;"},{"Add":" debug!(\"/is_tracked {:?}\", path);"},{"Add":" if remaining_path_components.next().is_none() {"},{"Add":" Ok((true, txn.get_inodes(&inode, None)?.cloned()))"},{"Add":" } else {"},{"Add":" Ok((false, None))"},{"Add":" }"},{"Add":"}"},{"Add":""}]}}],"owner":"irevoire","repo":"pijul","token":"W0SIy5i8o2sd0nroADz9iY2v4Z7IfKpRM4SNEETKPsQ=","login":null}

…

Dependencies

Change contents