{"header":{"message":"Fixing log -- filters, along with performance improvements","description":null,"timestamp":"2021-12-07T14:05:25.925158001Z","authors":[{}]},"hash":"6U42MTEZTINWUU2KLJLQW33ZBZXKTHPTF6TMEG56TO642CQDZQMQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["6U42MTEZTINWUU2KLJLQW33ZBZXKTHPTF6TMEG56TO642CQDZQMQC","Fixing log -- filters, along with performance improvements"],["AA",null],["6F6AAHK4M2IVS23TVISR5OJSTZXUSEKLOP5BMM7SUHYG2FQNTSGQC","Simplifying pijul::commands::log, and fixing Broken Pipe errors"],["SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","Converting to the new patch format \"online\""],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","Add path filtering for log, add json output for log"],["F2S6XETO6DQ4447O4WPAHISGTBRVWW2WZYJ633KKYWWYKW5GXBPQC","Fixing log --hash-only"]],"deps":["6F6AAHK4M2IVS23TVISR5OJSTZXUSEKLOP5BMM7SUHYG2FQNTSGQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","F2S6XETO6DQ4447O4WPAHISGTBRVWW2WZYJ633KKYWWYKW5GXBPQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":134376},"path":"pijul/src/commands/log.rs","line":2,"ins":{"up_context":[{"change":3,"pos":694}],"down_context":[{"change":3,"pos":42}],"flag":"BLOCK","start":0,"end":31,"inode":{"change":3,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":694},"to":{"change":3,"start":0,"end":42},"introduced_by":3}],"inode":{"change":3,"pos":134376}},"ins_contents":[{"Add":"use std::collections::HashMap;"}],"del_contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":134376},"path":"pijul/src/commands/log.rs","line":128,"ins":{"up_context":[{"change":3,"pos":1009}],"down_context":[{"change":3,"pos":1060}],"flag":"BLOCK","start":32,"end":172,"inode":{"change":3,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1009},"to":{"change":2,"start":2805,"end":2851},"introduced_by":2}],"inode":{"change":3,"pos":134376}},"ins_contents":[{"Add":") -> Result<"},{"Add":" Vec<("},{"Add":" libpijul::Inode,"},{"Add":" Option>,"},{"Add":" )>,"},{"Add":" Error,"},{"Add":"> {"}],"del_contents":[{"Del":") -> Result, Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":134376},"path":"pijul/src/commands/log.rs","line":158,"ins":{"up_context":[{"change":2,"pos":3222}],"down_context":[{"change":3,"pos":2759}],"flag":"BLOCK","start":173,"end":409,"inode":{"change":3,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3222},"to":{"change":2,"start":3222,"end":3297},"introduced_by":2}],"inode":{"change":3,"pos":134376}},"ins_contents":[{"Add":" Ok(Some(s)) => {"},{"Add":" let inode = libpijul::fs::find_inode(txn, s)?;"},{"Add":" let inode_position = txn.get_inodes(&inode, None)?;"},{"Add":" inodes.push((inode, inode_position.cloned()))"},{"Add":" }"}],"del_contents":[{"Del":" Ok(Some(s)) => inodes.push(libpijul::fs::find_inode(txn, s)?),\n"}]}},{"Edit":{"inode":{"change":3,"pos":134376},"path":"pijul/src/commands/log.rs","line":169,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2841},"to":{"change":3,"start":2841,"end":3001},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3001},"to":{"change":2,"start":3298,"end":3355},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3355},"to":{"change":3,"start":3070,"end":3111},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3070},"to":{"change":3,"start":3070,"end":3111},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3111},"to":{"change":2,"start":3356,"end":3405},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3405},"to":{"change":3,"start":3165,"end":3417},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3165},"to":{"change":3,"start":3165,"end":3417},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3417},"to":{"change":2,"start":3406,"end":3436},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3436},"to":{"change":3,"start":3489,"end":3787},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3489},"to":{"change":3,"start":3489,"end":3787},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3787},"to":{"change":2,"start":3437,"end":3573},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3573},"to":{"change":3,"start":4336,"end":4511},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4336},"to":{"change":3,"start":4336,"end":4511},"introduced_by":3}],"inode":{"change":3,"pos":134376}}},"contents":[{"Del":"/// Given a list of path filters which represent the files/directories for which\n/// the user wants to see the logs, find the subset of relevant change hashes.\n"},{"Del":"fn filtered_hashes(\n txn: &Txn,\n"},{"Del":" path: &Path,\n filters: &[String],\n"},{"Del":") -> Result, Error> {\n"},{"Del":" let inodes = get_inodes(txn, path, filters)?;\n let mut hashes = HashSet::::new();\n for inode in inodes {\n // The Position for the file Inode.\n let inode_position = match txn.get_inodes(&inode, None)? {\n"},{"Del":" None => continue,\n"},{"Del":" Some(p) => p,\n };\n for pair in txn.iter_touched(inode_position)? {\n let (position, touched_change_id) = pair?;\n // Push iff the file ChangeId for this element matches that of the file Inode\n if &position.change == &inode_position.change {\n"},{"Del":" let ser_h = txn.get_external(touched_change_id)?.unwrap();\n hashes.insert(libpijul::Hash::from(*ser_h));\n"},{"Del":" } else {\n // We've gone past the relevant subset of changes in the iterator.\n break;\n }\n }\n }\n Ok(hashes)\n}\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":134376},"path":"pijul/src/commands/log.rs","line":312,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10433},"to":{"change":3,"start":10433,"end":10702},"introduced_by":3}],"inode":{"change":3,"pos":134376}}},"contents":[{"Del":" // If the user applied path filters, figure out what change hashes\n // are to be logged.\n let mut requested_hashes = filtered_hashes(\n &self.txn,\n self.repo_path.as_ref(),\n self.cmd.filters.as_slice(),\n )?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":134376},"path":"pijul/src/commands/log.rs","line":313,"ins":{"up_context":[{"change":3,"pos":10703}],"down_context":[{"change":3,"pos":135674}],"flag":"BLOCK","start":410,"end":1702,"inode":{"change":3,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10703},"to":{"change":3,"start":10703,"end":11547},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11547},"to":{"change":2,"start":3650,"end":3695},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":3695},"to":{"change":3,"start":11678,"end":12071},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11678},"to":{"change":3,"start":11678,"end":12071},"introduced_by":3}],"inode":{"change":3,"pos":134376}},"ins_contents":[{"Add":" let inodes = get_inodes(&self.txn, &self.repo_path, &self.cmd.filters)?;"},{"Add":" let mut offset = self.offset;"},{"Add":" let mut limit = self.limit;"},{"Add":" for pr in self.txn.reverse_log(&*self.channel_ref.read(), None)? {"},{"Add":" let (_, (h, mrk)) = pr?;"},{"Add":" let cid = self.txn.get_internal(h)?.unwrap();"},{"Add":" let mut is_in_filters = inodes.is_empty();"},{"Add":" for (_, position) in inodes.iter() {"},{"Add":" if let Some(position) = position {"},{"Add":" is_in_filters = self.txn.get_touched_files(position, Some(cid))?.is_some();"},{"Add":" if is_in_filters {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" if is_in_filters {"},{"Add":" if offset == 0 && limit > 0 {"},{"Add":" // If there were no path filters applied, OR is this was one of the hashes"},{"Add":" // marked by the file filters that were applied"},{"Add":" let entry ="},{"Add":" self.mk_log_entry(&mut authors, &mut id_path, h.into(), Some(mrk.into()))?;"},{"Add":" f(entry).map_err(Error::E)?;"},{"Add":" limit -= 1"},{"Add":" } else if limit > 0 {"},{"Add":" offset -= 1"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"}],"del_contents":[{"Del":" // Get the (Hash, Merkle) pairs for the portion of reverse_log\n // that are between offset and limit.\n let hs = self\n .txn\n .reverse_log(&*self.channel_ref.read(), None)?\n .skip(self.offset)\n .take(self.limit)\n .map(|res| {\n res.map(|(_, (ser_h, ser_m))| {\n (libpijul::Hash::from(ser_h), libpijul::Merkle::from(ser_m))\n })\n });\n\n for pr in hs {\n let (h, mrk) = pr?;\n if (self.cmd.filters.is_empty()) || requested_hashes.remove(&h) {\n // If there were no path filters applied, OR is this was one of the hashes\n // marked by the file filters that were applied\n let entry = self.mk_log_entry(&mut authors, &mut id_path, h, Some(mrk))?;\n"},{"Del":" f(entry).map_err(Error::E)?;\n"},{"Del":" } else if requested_hashes.is_empty() {\n // If the user applied path filters, but the relevant change hashes\n // have been exhausted, we can break early.\n break;\n } else {\n // The user applied path filters; this wasn't a hit, but\n // there are still hits to be logged.\n continue;\n"}]}}],"owner":"irevoire","repo":"pijul","token":"4uDlWiglu9DJipcopaP/ss5ULQb1zSq5VVZB8ZGWjb4=","login":null}

…

Dependencies

Change contents