{"header":{"message":"Fix a panic when switching between channels that have different files","description":null,"timestamp":"2021-02-26T08:31:35.769683535Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","authors":[],"deps":{"hashes":[["MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Fix a panic when switching between channels that have different files"],["AA",null],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","Do not output unmodified files when resetting (fix)"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","Making the get_latest_touch function (useful to make archives) public in libpijul"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["K6GWUOD55G377RVEEMMRPZ4EUAHCM2BGXNRJTE5UZJFFMJGFCEZQC","Styling progress bars"]],"deps":["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":97650},"path":"pijul/src/commands/reset.rs","line":127,"ins":{"up_context":[{"change":3,"pos":1394}],"down_context":[{"change":3,"pos":1395}],"flag":"BLOCK","start":0,"end":66,"inode":{"change":3,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1394},"to":{"change":3,"start":1394,"end":1395},"introduced_by":3}],"inode":{"change":3,"pos":97650}},"ins_contents":[{"Add":" let mut paths = Vec::with_capacity(inodes.len());"}],"del_contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":97650},"path":"pijul/src/commands/reset.rs","line":129,"ins":{"up_context":[{"change":3,"pos":1438}],"down_context":[{"change":3,"pos":1499}],"flag":"BLOCK","start":67,"end":137,"inode":{"change":3,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1438},"to":{"change":3,"start":1438,"end":1499},"introduced_by":3}],"inode":{"change":3,"pos":97650}},"ins_contents":[{"Add":" if let Some((path, _)) = libpijul::fs::find_path("}],"del_contents":[{"Del":" let (path, _) = libpijul::fs::find_path(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":97650},"path":"pijul/src/commands/reset.rs","line":135,"ins":{"up_context":[{"change":3,"pos":1672}],"down_context":[{"change":3,"pos":1696}],"flag":"BLOCK","start":138,"end":386,"inode":{"change":3,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1672},"to":{"change":3,"start":1672,"end":1696},"introduced_by":3}],"inode":{"change":3,"pos":97650}},"ins_contents":[{"Add":" )? {"},{"Add":" paths.push(path)"},{"Add":" } else {"},{"Add":" paths.clear();"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" for path in paths.iter() {"}],"del_contents":[{"Del":" )?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":97650},"path":"pijul/src/commands/reset.rs","line":153,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2075}],"down_context":[{"change":3,"pos":101179}],"flag":"BLOCK","start":387,"end":734,"inode":{"change":3,"pos":97650}}},"contents":[{"Add":" if paths.is_empty() {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":3,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":458,"ins":{"up_context":[{"change":3,"pos":343}],"down_context":[{"change":3,"pos":469}],"flag":"BLOCK","start":735,"end":1016,"inode":{"change":3,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":343},"to":{"change":3,"start":343,"end":369},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":369},"to":{"change":2,"start":12019,"end":12120},"introduced_by":2}],"inode":{"change":3,"pos":111631}},"ins_contents":[{"Add":" if let Some((path, _)) ="},{"Add":" libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?"},{"Add":" {"},{"Add":" touched_paths.push(path)"},{"Add":" } else {"},{"Add":" touched_paths.clear();"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" touched_paths\n"},{"Del":" .push(libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?.0)\n"}]}},{"Edit":{"inode":{"change":3,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":484,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":11136}],"down_context":[{"change":19,"pos":2211}],"flag":"BLOCK","start":1017,"end":1293,"inode":{"change":3,"pos":111631}}},"contents":[{"Add":" if touched_paths.is_empty() {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":194289},"path":"pijul/src/commands/apply.rs","line":79,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1107}],"down_context":[{"change":3,"pos":1146}],"flag":"BLOCK","start":1294,"end":1361,"inode":{"change":3,"pos":194289}}},"contents":[{"Add":" let mut touched_files = Vec::with_capacity(touched.len());"}]}},{"Replacement":{"inode":{"change":3,"pos":194289},"path":"pijul/src/commands/apply.rs","line":81,"ins":{"up_context":[{"change":3,"pos":1173}],"down_context":[{"change":3,"pos":1293}],"flag":"BLOCK","start":1362,"end":1695,"inode":{"change":3,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1173},"to":{"change":3,"start":1173,"end":1293},"introduced_by":3}],"inode":{"change":3,"pos":194289}},"ins_contents":[{"Add":" if let Some((path, _)) ="},{"Add":" libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?"},{"Add":" {"},{"Add":" touched_files.push(path)"},{"Add":" } else {"},{"Add":" touched_files.clear();"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" for path in touched_files.iter() {"}],"del_contents":[{"Del":" let (path, _) =\n libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":194289},"path":"pijul/src/commands/apply.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1560}],"down_context":[{"change":3,"pos":196314}],"flag":"BLOCK","start":1696,"end":1972,"inode":{"change":3,"pos":194289}}},"contents":[{"Add":" if !touched_files.is_empty() {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" None,"},{"Add":" )?;"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1879,"ins":{"up_context":[{"change":3,"pos":489}],"down_context":[{"change":3,"pos":590}],"flag":"BLOCK","start":1973,"end":2073,"inode":{"change":3,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":489},"to":{"change":3,"start":77261,"end":77352},"introduced_by":3}],"inode":{"change":3,"pos":586748}},"ins_contents":[{"Add":" let (path, _) = crate::fs::find_path(changes, txn, channel, true, file_).unwrap().unwrap();"}],"del_contents":[{"Del":" let (path, _) = crate::fs::find_path(changes, txn, channel, true, file_).unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":717381},"path":"libpijul/src/lib.rs","line":555,"ins":{"up_context":[{"change":2,"pos":128217}],"down_context":[{"change":3,"pos":732030}],"flag":"BLOCK","start":2074,"end":2163,"inode":{"change":3,"pos":717381}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":128217},"to":{"change":3,"start":98460,"end":98541},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":731981},"to":{"change":3,"start":98460,"end":98541},"introduced_by":3}],"inode":{"change":3,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::FileError> {"}],"del_contents":[{"Del":" ) -> Result<(String, bool), output::FileError> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":717381},"path":"libpijul/src/lib.rs","line":568,"ins":{"up_context":[{"change":3,"pos":732453}],"down_context":[{"change":3,"pos":732502}],"flag":"BLOCK","start":2164,"end":2253,"inode":{"change":3,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":732453},"to":{"change":3,"start":98631,"end":98712},"introduced_by":3}],"inode":{"change":3,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::FileError> {"}],"del_contents":[{"Del":" ) -> Result<(String, bool), output::FileError> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":737429},"path":"libpijul/src/fs.rs","line":836,"ins":{"up_context":[{"change":3,"pos":761102}],"down_context":[{"change":3,"pos":761147}],"flag":"BLOCK","start":2254,"end":2343,"inode":{"change":3,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":761102},"to":{"change":3,"start":113877,"end":113958},"introduced_by":3}],"inode":{"change":3,"pos":737429}},"ins_contents":[{"Add":") -> Result, crate::output::FileError> {"}],"del_contents":[{"Del":") -> Result<(String, bool), crate::output::FileError> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":737429},"path":"libpijul/src/fs.rs","line":846,"ins":{"up_context":[{"change":3,"pos":761463}],"down_context":[{"change":2,"pos":133097}],"flag":"BLOCK","start":2344,"end":2747,"inode":{"change":3,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":761463},"to":{"change":3,"start":6158,"end":6237},"introduced_by":3}],"inode":{"change":3,"pos":737429}},"ins_contents":[{"Add":" let inode_vertex = match txn.find_block_end(txn.graph(channel), v) {"},{"Add":" Ok(block) => block,"},{"Add":" Err(BlockError::Block { block, .. }) => {"},{"Add":" debug!(\"block not found {:?}\", block);"},{"Add":" assert!(path.is_empty());"},{"Add":" return Ok(None)"},{"Add":" },"},{"Add":" Err(BlockError::Txn(t)) => return Err(crate::output::FileError::Txn(t)),"},{"Add":" };"}],"del_contents":[{"Del":" let inode_vertex = txn.find_block_end(txn.graph(channel), v).unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":737429},"path":"libpijul/src/fs.rs","line":910,"ins":{"up_context":[{"change":3,"pos":763251}],"down_context":[{"change":3,"pos":628}],"flag":"BLOCK","start":2748,"end":2790,"inode":{"change":3,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":763251},"to":{"change":3,"start":763251,"end":763287},"introduced_by":3}],"inode":{"change":3,"pos":737429}},"ins_contents":[{"Add":" Ok(Some((path.join(\"/\"), all_alive)))"}],"del_contents":[{"Del":" Ok((path.join(\"/\"), all_alive))\n"}]}}],"owner":"irevoire","repo":"pijul","token":"MKfDYAN6ZVs2QDMvAa/0lNB1yvIx+z+STsf3pKQkjTo=","login":null}

…

Dependencies

Change contents