{"header":{"message":"Reset: only output changed files","description":null,"timestamp":"2021-01-10T16:27:45.786063522Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","authors":[],"deps":{"hashes":[["QMTANHVNRPQ5IX66FYQBFRBDCTN6YKMNCO6OHTQ6QCUASPWWXJKAC","Reset: only output changed files"],["AA",null],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","Fix path prefix striping on Windows."],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["QYY37T6YMICHA57GBXBBR4OYE2A76SFDKXPDKIKSEDDXCNQVC5CAC","Fixing a panic with reset --dry-run and no input"],["VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","channel switch as an alias to reset"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"]],"deps":["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","VQPAUKBQ2POZKL7CZFAZK5ZQKEBYL27XZYZWYUSH5AH25KK6DWKAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","QYY37T6YMICHA57GBXBBR4OYE2A76SFDKXPDKIKSEDDXCNQVC5CAC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":1,"ins":{"up_context":[{"change":4,"pos":97650}],"down_context":[{"change":4,"pos":1289}],"flag":"BLOCK","start":0,"end":42,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":97650},"to":{"change":3,"start":557,"end":588},"introduced_by":3}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":"use std::collections::{HashMap, HashSet};"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":7,"ins":{"up_context":[{"change":4,"pos":1330}],"down_context":[{"change":4,"pos":1331}],"flag":"BLOCK","start":43,"end":164,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1330},"to":{"change":4,"start":2048,"end":2100},"introduced_by":4}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":"use libpijul::pristine::{ChangeId, Position};"},{"Add":"use libpijul::{ChannelTxnT, DepsTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt};"}],"del_contents":[{"Del":"use libpijul::{MutTxnT, MutTxnTExt, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":72,"ins":{"up_context":[{"change":4,"pos":604}],"down_context":[{"change":4,"pos":869}],"flag":"BLOCK","start":165,"end":545,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":604},"to":{"change":4,"start":727,"end":767},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":727},"to":{"change":4,"start":727,"end":767},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":767},"to":{"change":4,"start":767,"end":835},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":835},"to":{"change":4,"start":2101,"end":2136},"introduced_by":4}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":" if overwrite_changes {"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" &mut HashMap::new(),"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" if !overwrite_changes {\n"},{"Del":" // No need to change channel, no need to reset.\n"},{"Del":" return Ok(());\n"}]}},{"Edit":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":83,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":887}],"down_context":[{"change":4,"pos":887}],"flag":"BLOCK","start":546,"end":577,"inode":{"change":4,"pos":97650}}},"contents":[{"Add":" return Ok(());"}]}},{"Edit":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":101,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":100549},"to":{"change":4,"start":100549,"end":100701},"introduced_by":4}],"inode":{"change":4,"pos":97650}}},"contents":[{"Del":" }\n\n if self.channel.is_some() {\n repo.config.current_channel = self.channel;\n repo.save_config()?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":105,"ins":{"up_context":[{"change":4,"pos":100946}],"down_context":[{"change":4,"pos":101179}],"flag":"BLOCK","start":578,"end":2075,"inode":{"change":4,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":100946},"to":{"change":4,"start":100946,"end":101109},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":101109},"to":{"change":3,"start":589,"end":630},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":630},"to":{"change":4,"start":101109,"end":101179},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":101109},"to":{"change":4,"start":101109,"end":101179},"introduced_by":4}],"inode":{"change":4,"pos":97650}},"ins_contents":[{"Add":" let mut inodes = HashSet::new();"},{"Add":" if let Some(cur) = txn.load_channel(current_channel)? {"},{"Add":" let mut changediff = HashSet::new();"},{"Add":" let (a, b, s) = libpijul::pristine::last_common_state("},{"Add":" &txn,"},{"Add":" &cur.borrow(),"},{"Add":" &channel.borrow(),"},{"Add":" )?;"},{"Add":" debug!(\"last common state {:?}\", s);"},{"Add":" changes_after(&txn, &cur.borrow(), a, &mut changediff, &mut inodes)?;"},{"Add":" changes_after(&txn, &channel.borrow(), b, &mut changediff, &mut inodes)?;"},{"Add":" }"},{"Add":""},{"Add":" if self.channel.is_some() {"},{"Add":" repo.config.current_channel = self.channel;"},{"Add":" repo.save_config()?;"},{"Add":" }"},{"Add":""},{"Add":" for pos in inodes.iter() {"},{"Add":" let (path, _) = libpijul::fs::find_path("},{"Add":" &repo.changes,"},{"Add":" &txn,"},{"Add":" &channel.borrow(),"},{"Add":" false,"},{"Add":" *pos,"},{"Add":" )?;"},{"Add":" debug!(\"resetting {:?}\", path);"},{"Add":" txn.output_repository_no_pending("},{"Add":" &mut repo.working_copy,"},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" &mut HashMap::new(),"},{"Add":" &path,"},{"Add":" true,"},{"Add":" )?;"},{"Add":" }"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.working_copy,\n &repo.changes,\n &mut channel,\n"},{"Del":" &mut HashMap::new(),\n"},{"Del":" \"\",\n true,\n )?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":165,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":101738}],"down_context":[{"change":4,"pos":101738}],"flag":"BLOCK","start":2076,"end":2825,"inode":{"change":4,"pos":97650}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn changes_after("},{"Add":" txn: &T,"},{"Add":" chan: &T::Channel,"},{"Add":" from: u64,"},{"Add":" changediff: &mut HashSet,"},{"Add":" inodes: &mut HashSet>,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" for x in libpijul::pristine::changeid_log(txn, chan, from)? {"},{"Add":" let (n, (u, _)) = x?;"},{"Add":" debug!(\"{:?} {:?} {:?}\", n, u, from);"},{"Add":" if n <= from {"},{"Add":" continue;"},{"Add":" }"},{"Add":" if changediff.insert(u) {"},{"Add":" for y in txn.iter_rev_touched_files(u, None)? {"},{"Add":" let (uu, pos) = y?;"},{"Add":" if uu < u {"},{"Add":" continue;"},{"Add":" } else if uu > u {"},{"Add":" break;"},{"Add":" }"},{"Add":" inodes.insert(pos);"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":4,"pos":97650},"path":"pijul/src/commands/reset.rs","line":193,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":101744}],"down_context":[{"change":4,"pos":101744}],"flag":"BLOCK","start":2826,"end":2837,"inode":{"change":4,"pos":97650}}},"contents":[{"Add":" Ok(())"}]}},{"Replacement":{"inode":{"change":4,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":312,"ins":{"up_context":[{"change":4,"pos":13929}],"down_context":[{"change":4,"pos":6416}],"flag":"BLOCK","start":2838,"end":2918,"inode":{"change":4,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":13929},"to":{"change":4,"start":13929,"end":13990},"introduced_by":4}],"inode":{"change":4,"pos":111631}},"ins_contents":[{"Add":" if txn.channel_has_state(&channel.borrow(), m)?.is_some() {"}],"del_contents":[{"Del":" if txn.channel_has_state(&channel, m)? {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":339,"ins":{"up_context":[{"change":4,"pos":14545}],"down_context":[{"change":4,"pos":7403}],"flag":"BLOCK","start":2919,"end":3003,"inode":{"change":4,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":14545},"to":{"change":4,"start":14545,"end":14610},"introduced_by":4}],"inode":{"change":4,"pos":111631}},"ins_contents":[{"Add":" if txn.channel_has_state(&channel.borrow(), m)?.is_some() {"}],"del_contents":[{"Del":" if txn.channel_has_state(&channel, m)? {\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":809,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":43985}],"down_context":[{"change":2,"pos":43985}],"flag":"BLOCK","start":3004,"end":3213,"inode":{"change":4,"pos":531056}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" fn channel_has_state("},{"Add":" &self,"},{"Add":" channel: &Self::Channel,"},{"Add":" m: Merkle,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" Ok(self.txn.get(&channel.states, m, None)?)"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1302,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":556904},"to":{"change":4,"start":49759,"end":49976},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":49976},"to":{"change":4,"start":558202,"end":558208},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":558202},"to":{"change":4,"start":558202,"end":558208},"introduced_by":4}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":" fn channel_has_state(\n &self,\n channel: &ChannelRef,\n m: Merkle,\n ) -> Result> {\n Ok(self.txn.get(&channel.borrow().states, m, None)?.is_some())\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":222,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":51831}],"down_context":[{"change":2,"pos":51831}],"flag":"BLOCK","start":3214,"end":3367,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":""},{"Add":" fn channel_has_state("},{"Add":" &self,"},{"Add":" channel: &Self::Channel,"},{"Add":" hash: Merkle,"},{"Add":" ) -> Result, TxnErr>;"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":427,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":59897},"to":{"change":4,"start":59897,"end":60045},"introduced_by":4}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":" hash: Merkle,\n ) -> Result>;\n fn channel_has_state(\n &self,\n channel: &ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":555,"ins":{"up_context":[{"change":4,"pos":39578}],"down_context":[{"change":4,"pos":39919}],"flag":"BLOCK","start":3368,"end":3421,"inode":{"change":4,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":39866},"to":{"change":4,"start":62378,"end":62438},"introduced_by":4}],"inode":{"change":4,"pos":586748}},"ins_contents":[{"Add":"pub fn changeid_log<'db, 'txn: 'db, T: ChannelTxnT>("}],"del_contents":[{"Del":"pub(crate) fn changeid_log<'db, 'txn: 'db, T: ChannelTxnT>(\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1634,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":55586}],"down_context":[{"change":4,"pos":55586}],"flag":"BLOCK","start":3422,"end":4854,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn first_state_after(txn: &T, c: &T::Channel, pos: u64) -> Result, TxnErr> {"},{"Add":" for x in T::cursor_revchangeset_ref(txn, T::rev_changes(&c), Some(pos))? {"},{"Add":" let (n, (_, m)) = x?;"},{"Add":" if n >= pos {"},{"Add":" return Ok(Some((n, m)))"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":"}"},{"Add":""},{"Add":"fn last_state(txn: &T, c: &T::Channel) -> Result, TxnErr> {"},{"Add":" if let Some(e) = txn"},{"Add":" .rev_cursor_revchangeset(T::rev_changes(&c), None)?"},{"Add":" .next()"},{"Add":" {"},{"Add":" let (b, (_, state)) = e?;"},{"Add":" Ok(Some((b, state)))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Find the last state of c1 that is also in c0."},{"Add":"pub fn last_common_state(txn: &T, c0: &T::Channel, c1: &T::Channel) -> Result<(u64, u64, Merkle), TxnErr> {"},{"Add":" let mut a = 0;"},{"Add":" let (mut b, mut state) = if let Some(x) = last_state(txn, c1)? {"},{"Add":" x"},{"Add":" } else {"},{"Add":" return Ok((0, 0, Merkle::zero()))"},{"Add":" };"},{"Add":" if let Some(aa) = txn.channel_has_state(c0, state)? {"},{"Add":" return Ok((aa, b, state))"},{"Add":" }"},{"Add":" let mut aa = 0;"},{"Add":" while a < b {"},{"Add":" let mid = (a+b) / 2;"},{"Add":" let (_, s) = first_state_after(txn, c1, mid)?.unwrap();"},{"Add":" state = s;"},{"Add":" if let Some(aa_) = txn.channel_has_state(c0, state)? {"},{"Add":" aa = aa_;"},{"Add":" a = mid"},{"Add":" } else {"},{"Add":" b = mid"},{"Add":" }"},{"Add":" }"},{"Add":" Ok((aa, a, state))"}]}}],"owner":"irevoire","repo":"pijul","token":"QsvU6v7mYFBjL7RpQmVJW6xlm2I9ZpEFnX2FX5wFMd4=","login":null}

…

Dependencies

Change contents