{"header":{"message":"In `pijul git`, avoid diffing files not modified by a commit","description":null,"timestamp":"2022-10-18T07:48:23.082432421Z","authors":[{}]},"hash":"FF4TXHN5T4QFIUI4MNCWZYNV6D5F5K5JKPBESN3EPP5YHLHSYI5AC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["FF4TXHN5T4QFIUI4MNCWZYNV6D5F5K5JKPBESN3EPP5YHLHSYI5AC","In `pijul git`, avoid diffing files not modified by a commit"],["AA",null],["WFXSB6RAB3GNOJ5VB63M5BHLUI7J5TPUUOGFE4ZWGLFWULK7RHAAC","Do not run `pijul git` if there are uncommitted changes"],["OPC2VAZDO4HL6K4BBNQP5A5YD2DI6UYI7O7ZQWAGLU7Z662PEOBAC","Writing an initial config file at initialisation"],["RP7YRM5QOINW7FB5BGNZEXVQN7TXB7LLLHXZPPAI6DGFGRP7JPFQC","Import Git repos without writing anything to disk"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["AOKPEHAJHNISSGUW2FOLOC4CZODFP5HXLACVFMI3PQMJJ245QK6AC","Fixing the `pijul git` command with the new init"],["VU4KVXHWMLZCJJDO3DDUTNTYUDCDD7RSJ3QJ67EMNZV44H2YIKSAC","Git import was importing parents and hidden files (including .git), in some cases"],["WTRH4B2XODLZWSRMB5CCQAKDQLAXGOY2CEEABXGXEUJLZI4OX2QQC","Formatting"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["NEJOYVJB4VXJJPFBWD2YK7PK6KKHQGRHIJHLEJ53HLQ3ZQRE5EPQC","Fixing the Git feature"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","Fixing `pijul git`"],["GBLM3JLRCNEZLICNLV6M26YCZ4EYDG2F5BJOBH4FIBOM4W473LYAC","Fix options of git subcommand"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","Deterministic Git import"],["VGBH3ED6NZPQFNXHS4R3J2QIPN5WP4SUMCYQLBER3CV3AGCVHJJQC","The Git feature does not need to be async"],["KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","A few fixes in the documentation comments"],["S7MPXAPHFSUUUUDEDGGUHOJXMEPYCWKYEVK4FVWQLRJLXGBQ4MRQC","Removing warnings in pijul::commands::git"]],"deps":["WFXSB6RAB3GNOJ5VB63M5BHLUI7J5TPUUOGFE4ZWGLFWULK7RHAAC","OPC2VAZDO4HL6K4BBNQP5A5YD2DI6UYI7O7ZQWAGLU7Z662PEOBAC","RP7YRM5QOINW7FB5BGNZEXVQN7TXB7LLLHXZPPAI6DGFGRP7JPFQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","KWAMD2KR5UYRHHPZWL7GY2KQKNXNVS4BYBVK3FXDI23NQMWA3U4QC","GBLM3JLRCNEZLICNLV6M26YCZ4EYDG2F5BJOBH4FIBOM4W473LYAC","BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","VU4KVXHWMLZCJJDO3DDUTNTYUDCDD7RSJ3QJ67EMNZV44H2YIKSAC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","NEJOYVJB4VXJJPFBWD2YK7PK6KKHQGRHIJHLEJ53HLQ3ZQRE5EPQC","WTRH4B2XODLZWSRMB5CCQAKDQLAXGOY2CEEABXGXEUJLZI4OX2QQC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","VGBH3ED6NZPQFNXHS4R3J2QIPN5WP4SUMCYQLBER3CV3AGCVHJJQC","AOKPEHAJHNISSGUW2FOLOC4CZODFP5HXLACVFMI3PQMJJ245QK6AC","S7MPXAPHFSUUUUDEDGGUHOJXMEPYCWKYEVK4FVWQLRJLXGBQ4MRQC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":6,"ins":{"up_context":[{"change":5,"pos":970}],"down_context":[{"change":5,"pos":137367}],"flag":"BLOCK","start":0,"end":53,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":137305},"to":{"change":5,"start":728,"end":772},"introduced_by":5}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":"use std::collections::{BTreeMap, BTreeSet, HashSet};"}],"del_contents":[{"Del":"use std::collections::{BTreeMap, BTreeSet};\n"}]}},{"Edit":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":14,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":137477}],"down_context":[{"change":5,"pos":1590}],"flag":"BLOCK","start":54,"end":191,"inode":{"change":5,"pos":137210}}},"contents":[{"Add":" /// Process this path instead of the current directory, creating a Pijul repository if necessary."},{"Add":" pub git_path: Option,"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":17,"ins":{"up_context":[{"change":5,"pos":1692}],"down_context":[{"change":5,"pos":1728}],"flag":"BLOCK","start":192,"end":229,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1692},"to":{"change":5,"start":1692,"end":1728},"introduced_by":5}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" pub pijul_path: Option,"}],"del_contents":[{"Del":" pub repo_path: Option,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":43,"ins":{"up_context":[{"change":5,"pos":52}],"down_context":[{"change":5,"pos":138182}],"flag":"BLOCK","start":230,"end":316,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":52},"to":{"change":5,"start":0,"end":85},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":14293},"to":{"change":5,"start":0,"end":85},"introduced_by":5}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" let repo = if let Ok(repo) = Repository::find_root(self.pijul_path.clone()) {"}],"del_contents":[{"Del":" let repo = if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":45,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":138199}],"down_context":[{"change":5,"pos":138199}],"flag":"BLOCK","start":317,"end":504,"inode":{"change":5,"pos":137210}}},"contents":[{"Add":" } else {"},{"Add":" Repository::init(self.pijul_path.clone(), None, None)?"},{"Add":" };"},{"Add":" let git_path = if let Some(git_path) = self.git_path.clone() {"},{"Add":" git_path"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":51,"ins":{"up_context":[{"change":5,"pos":138216}],"down_context":[{"change":5,"pos":138270}],"flag":"BLOCK","start":505,"end":535,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":138216},"to":{"change":3,"start":764,"end":830},"introduced_by":3}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" repo.path.clone()"}],"del_contents":[{"Del":" Repository::init(self.repo_path.clone(), None, None)?\n"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":53,"ins":{"up_context":[{"change":5,"pos":138281}],"down_context":[{"change":2,"pos":0}],"flag":"BLOCK","start":536,"end":590,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":138281},"to":{"change":5,"start":138281,"end":138336},"introduced_by":5}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" let git = git2::Repository::open(&git_path)?;"}],"del_contents":[{"Del":" let git = git2::Repository::open(&repo.path)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":489,"ins":{"up_context":[{"change":5,"pos":152146}],"down_context":[{"change":5,"pos":152214}],"flag":"BLOCK","start":591,"end":682,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":152146},"to":{"change":4,"start":153,"end":227},"introduced_by":4}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":") -> Result<(git2::Object<'a>, BTreeMap, HashSet), anyhow::Error> {"}],"del_contents":[{"Del":") -> Result<(git2::Object<'a>, BTreeMap), anyhow::Error> {\n"}]}},{"Edit":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":499,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":268}],"down_context":[{"change":5,"pos":153473}],"flag":"BLOCK","start":683,"end":718,"inode":{"change":5,"pos":137210}}},"contents":[{"Add":" let mut pref = HashSet::new();"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":558,"ins":{"up_context":[{"change":5,"pos":156099}],"down_context":[{"change":5,"pos":156213}],"flag":"BLOCK","start":719,"end":920,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":156099},"to":{"change":5,"start":156099,"end":156162},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":156162},"to":{"change":4,"start":348,"end":407},"introduced_by":4}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" let new_path_ = new_path.to_path_buf();"},{"Add":" pref.insert(new_path.to_str().unwrap().to_string());"},{"Add":" prefixes.insert(new_path_, is_dir);"}],"del_contents":[{"Del":" let new_path = new_path.to_path_buf();\n"},{"Del":" prefixes.insert(new_path, is_dir);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":569,"ins":{"up_context":[{"change":5,"pos":156608}],"down_context":[{"change":5,"pos":156852}],"flag":"BLOCK","start":921,"end":1347,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":156608},"to":{"change":5,"start":156608,"end":156742},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":156742},"to":{"change":4,"start":468,"end":594},"introduced_by":4}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" let old_path_ = old_path.to_path_buf();"},{"Add":" let new_path_ = new_path.to_path_buf();"},{"Add":" prefixes.insert(old_path_, is_dir);"},{"Add":" prefixes.insert(new_path_, is_dir);"},{"Add":" pref.insert(old_path.to_str().unwrap().to_string());"},{"Add":" pref.insert(new_path.to_str().unwrap().to_string());"}],"del_contents":[{"Del":" let old_path = old_path.to_path_buf();\n let new_path = new_path.to_path_buf();\n"},{"Del":" prefixes.insert(old_path, is_dir);\n prefixes.insert(new_path, is_dir);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":603,"ins":{"up_context":[{"change":5,"pos":157439}],"down_context":[{"change":4,"pos":682}],"flag":"BLOCK","start":1348,"end":1381,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":157439},"to":{"change":5,"start":157439,"end":157466},"introduced_by":5}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" Ok((object, prefixes, pref))"}],"del_contents":[{"Del":" Ok((object, prefixes))\n"}]}},{"Edit":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":610,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":776}],"down_context":[{"change":5,"pos":157466}],"flag":"BLOCK","start":1382,"end":1409,"inode":{"change":5,"pos":137210}}},"contents":[{"Add":" pref: HashSet,"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":644,"ins":{"up_context":[{"change":4,"pos":1889}],"down_context":[{"change":4,"pos":2015}],"flag":"BLOCK","start":1410,"end":1652,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1889},"to":{"change":4,"start":1889,"end":2015},"introduced_by":4}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" fn modified_time(&self, x: &str) -> Result {"},{"Add":" if self.pref.contains(x) {"},{"Add":" Ok(std::time::SystemTime::now())"},{"Add":" } else {"},{"Add":" Ok(std::time::SystemTime::UNIX_EPOCH)"},{"Add":" }"}],"del_contents":[{"Del":" fn modified_time(&self, _: &str) -> Result {\n Ok(std::time::SystemTime::now())\n"}]}},{"Replacement":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":663,"ins":{"up_context":[{"change":5,"pos":3958}],"down_context":[{"change":5,"pos":319}],"flag":"BLOCK","start":1653,"end":1744,"inode":{"change":5,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":3958},"to":{"change":5,"start":14694,"end":14776},"introduced_by":5}],"inode":{"change":5,"pos":137210}},"ins_contents":[{"Add":" let (object, prefixes, prefstr) = git_reset(git, repo, &txn, &channel, child, stats)?;"}],"del_contents":[{"Del":" let (object, prefixes) = git_reset(git, repo, &txn, &channel, child, stats)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":137210},"path":"pijul/src/commands/git.rs","line":731,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3115}],"down_context":[{"change":4,"pos":3115}],"flag":"BLOCK","start":1745,"end":1772,"inode":{"change":5,"pos":137210}}},"contents":[{"Add":" pref: prefstr,"}]}}],"owner":"irevoire","repo":"pijul","token":"kYtEibWafXW3ju30SoPwwAmup0H2suaT3tUDG01okmM=","login":null}

…

Dependencies

Change contents