{"header":{"message":"Add path filtering for log, add json output for log","description":"Relates to discussion #353 (filtering) and #505 (structured CLI output).\n\nThe path filtering is used as `pijul log -- path*` and will log only the\nchanges that touched the listed paths.\n\nThe json output feature is invoked as `pijul log --output-format=json`.\nSince internally it uses serde, this can be extended to any serde target\nformat.\nThe implementation creates two new structs `LogIterator` and `LogEntry`;\nthe former is used to hold the state that was previously loose in `Log::run`,\nand provides a `for_each` method that can be used to map over the log entries\nefficiently and in a way that reuses the most code (where efficiently means\nwe only have one log entry in memory at a time).\n","timestamp":"2021-08-14T12:06:43.009565Z","authors":[{}]},"hash":"OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","authors":[{"login":"ammkrn","key":"8pRcgpBDWybJEh4eZbHW8iV75uVLVJ5dkoYnwL7kkMgE"}],"deps":{"hashes":[["OU6JOR3CDZTH2H3NTGMV3WDIAWPD3VEJI7JRY3VJ7LPDR3QOA52QC","Add path filtering for log, add json output for log"],["AA",null],["RUBBHYZ7MCLKJIHZ3EWEC3JR3FSKOU4T2NH7KRBG7ECAU4JF3LUAC","Removing unnecessary async/await"],["UW3KU7DHQDCI6GRYI6FI5S6PCLKNCN4QPSAU7WJROY2D5MPQYRAQC","Limiting the output size of log (with a CLI flag)"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","Converting to the new patch format \"online\""],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["GURIBVW66JDQK3SJZRGVJ2MQLMT7JD4KLI5QPQZGPAL7WH3T6T4AC","Fixing the pager"],["I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","Minor cleanup"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","commands: set up pager for diff, change, and credit"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","Fixing log --hash-only"],["PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","Do not load the entire change in memory in log"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"]],"deps":["RUBBHYZ7MCLKJIHZ3EWEC3JR3FSKOU4T2NH7KRBG7ECAU4JF3LUAC","UW3KU7DHQDCI6GRYI6FI5S6PCLKNCN4QPSAU7WJROY2D5MPQYRAQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","GURIBVW66JDQK3SJZRGVJ2MQLMT7JD4KLI5QPQZGPAL7WH3T6T4AC","VIHXB7SGRETFPHPYZFSRGOFRXEO4RZY57WDZSU6IAUEJRU3HPKQAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","PH7B6I3U5XCACAX6VX3ZDJD2DQOQS7725R6CTOATNC26NP4VPUFQC","PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","SMMBFECLGSUKRZW5YPOQPOQCOY2CH2OTZXBSZ3KG2N3J3HQZ5PSAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":2,"ins":{"up_context":[{"change":4,"pos":694}],"down_context":[{"change":4,"pos":2043}],"flag":"BLOCK","start":0,"end":69,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":694},"to":{"change":4,"start":694,"end":725},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":"use std::collections::{HashMap, HashSet};"},{"Add":"use std::convert::TryFrom;"}],"del_contents":[{"Del":"use std::collections::HashMap;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":5,"ins":{"up_context":[{"change":4,"pos":2063}],"down_context":[{"change":4,"pos":2087}],"flag":"BLOCK","start":70,"end":102,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2063},"to":{"change":4,"start":2063,"end":2087},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":"use std::path::{Path, PathBuf};"}],"del_contents":[{"Del":"use std::path::PathBuf;\n"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":2088}],"down_context":[{"change":4,"pos":16925}],"flag":"BLOCK","start":103,"end":138,"inode":{"change":4,"pos":134376}}},"contents":[{"Add":"use crate::repository::Repository;"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":134460}],"down_context":[{"change":4,"pos":3357}],"flag":"BLOCK","start":139,"end":224,"inode":{"change":4,"pos":134376}}},"contents":[{"Add":"use libpijul::pristine::{sanakirja::Txn, ChannelRef, DepsTxnT, GraphTxnT, TreeTxnT};"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":13,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3396}],"down_context":[{"change":4,"pos":134559}],"flag":"BLOCK","start":225,"end":291,"inode":{"change":4,"pos":134376}}},"contents":[{"Add":"use serde::ser::{SerializeSeq, Serializer};"},{"Add":"use serde::Serialize;"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":16,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":134560}],"down_context":[{"change":4,"pos":134560}],"flag":"BLOCK","start":292,"end":346,"inode":{"change":4,"pos":134376}}},"contents":[{"Add":"/// A struct containing user-input assembled by Clap."}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":40,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":1718}],"down_context":[{"change":4,"pos":134881}],"flag":"BLOCK","start":347,"end":722,"inode":{"change":4,"pos":134376}}},"contents":[{"Add":" #[clap(long = \"output-format\")]"},{"Add":" output_format: Option,"},{"Add":" /// Filter log output, showing only log entries that touched the specified"},{"Add":" /// files. Accepted as a list of paths relative to your current directory."},{"Add":" /// Currently, filters can only be applied when logging the channel that's"},{"Add":" /// in use."},{"Add":" #[clap(last = true)]"},{"Add":" filters: Vec,"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":50,"ins":{"up_context":[{"change":4,"pos":134884}],"down_context":[{"change":4,"pos":135006}],"flag":"BLOCK","start":723,"end":8694,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":134884},"to":{"change":4,"start":134884,"end":134895},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":134895},"to":{"change":2,"start":1719,"end":1771},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1771},"to":{"change":4,"start":21049,"end":21108},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7083},"to":{"change":4,"start":21049,"end":21108},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":"// A lot of error-handling noise here, but since we're dealing with"},{"Add":"// a user-command and a bunch of file-IO/path manipulation it's"},{"Add":"// probably necessary for the feedback to be good."},{"Add":"fn get_inodes("},{"Add":" txn: &impl libpijul::pristine::TreeTxnT,"},{"Add":" repo_path: &Path,"},{"Add":" pats: &[String],"},{"Add":") -> Result, anyhow::Error> {"},{"Add":" let mut inodes = Vec::new();"},{"Add":" for pat in pats {"},{"Add":" let canon_path = match Path::new(pat).canonicalize() {"},{"Add":" Err(e) if matches!(e.kind(), std::io::ErrorKind::NotFound) => {"},{"Add":" bail!("},{"Add":" \"pijul log couldn't find a file or directory corresponding to `{}`\","},{"Add":" pat"},{"Add":" )"},{"Add":" }"},{"Add":" Err(e) => return Err(e.into()),"},{"Add":" Ok(p) => p,"},{"Add":" };"},{"Add":""},{"Add":" match canon_path.strip_prefix(repo_path).map(|p| p.to_str()) {"},{"Add":" // strip_prefix error is if repo_path is not a prefix of canon_path,"},{"Add":" // which would only happen if they pased in a filter path that's not"},{"Add":" // in the repository."},{"Add":" Err(_) => bail!("},{"Add":" \"pijul log couldn't assemble file prefix for pattern `{}`; \\"},{"Add":" {} was not a file in the repository at {}\","},{"Add":" pat,"},{"Add":" canon_path.display(),"},{"Add":" repo_path.display()"},{"Add":" ),"},{"Add":" // PathBuf.to_str() returns none iff the path contains invalid UTF-8."},{"Add":" Ok(None) => bail!("},{"Add":" \"pijul log couldn't assemble file prefix for pattern `{}`; \\"},{"Add":" the path contained invalid UTF-8\","},{"Add":" pat"},{"Add":" ),"},{"Add":" Ok(Some(s)) => match libpijul::fs::find_inode(txn, s) {"},{"Add":" Err(e) => bail!("},{"Add":" \"pijul log couldn't assemble file prefix for pattern `{}`; \\"},{"Add":" no Inode found for the corresponding path. Internal error: {:?}\","},{"Add":" pat,"},{"Add":" e"},{"Add":" ),"},{"Add":" Ok(inode) => {"},{"Add":" inodes.push(inode);"},{"Add":" }"},{"Add":" },"},{"Add":" };"},{"Add":" }"},{"Add":" log::debug!(\"log filters: {:#?}\\n\", pats);"},{"Add":" Ok(inodes)"},{"Add":"}"},{"Add":""},{"Add":"/// Given a list of path filters which represent the files/directories for which"},{"Add":"/// the user wants to see the logs, find the subset of relevant change hashes."},{"Add":"fn filtered_hashes("},{"Add":" txn: &T,"},{"Add":" path: &Path,"},{"Add":" filters: &[String],"},{"Add":") -> Result, anyhow::Error> {"},{"Add":" let inodes = get_inodes(txn, path, filters)?;"},{"Add":" let mut hashes = HashSet::::new();"},{"Add":" for inode in inodes {"},{"Add":" // The Position for the file Inode."},{"Add":" let inode_position = match txn.get_inodes(&inode, None)? {"},{"Add":" None => bail!(\"Failed to get matching inode: {:?}\", inode),"},{"Add":" Some(p) => p,"},{"Add":" };"},{"Add":" for pair in txn.iter_touched(inode_position)? {"},{"Add":" let (position, touched_change_id) = pair?;"},{"Add":" // Push iff the file ChangeId for this element matches that of the file Inode"},{"Add":" if &position.change == &inode_position.change {"},{"Add":" match txn.get_external(touched_change_id)? {"},{"Add":" Some(ser_h) => {"},{"Add":" hashes.insert(libpijul::Hash::from(*ser_h));"},{"Add":" }"},{"Add":" _ => {"},{"Add":" log::error!("},{"Add":" \"`get_external` failed to retrieve full hash for ChangeId {:?}\","},{"Add":" touched_change_id"},{"Add":" );"},{"Add":" bail!(\"Failed to retrieve full hash for {:?}\", touched_change_id)"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" // We've gone past the relevant subset of changes in the iterator."},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(hashes)"},{"Add":"}"},{"Add":""},{"Add":"/// A single log entry created by [`LogIterator`]. The fields are"},{"Add":"/// all `Option` so that users can more precisely choose what"},{"Add":"/// data they want."},{"Add":"///"},{"Add":"/// The implementaiton of [`std::fmt::Display`] is the standard method"},{"Add":"/// of pretty-printing a `LogEntry` to the terminal."},{"Add":"#[derive(Serialize)]"},{"Add":"struct LogEntry {"},{"Add":" #[serde(skip_serializing_if = \"Option::is_none\")]"},{"Add":" hash: Option,"},{"Add":" #[serde(skip_serializing_if = \"Option::is_none\")]"},{"Add":" state: Option,"},{"Add":" #[serde(skip_serializing_if = \"Option::is_none\")]"},{"Add":" authors: Option>,"},{"Add":" #[serde(skip_serializing_if = \"Option::is_none\")]"},{"Add":" timestamp: Option>,"},{"Add":" #[serde(skip_serializing_if = \"Option::is_none\")]"},{"Add":" message: Option,"},{"Add":" #[serde(skip_serializing_if = \"Option::is_none\")]"},{"Add":" description: Option,"},{"Add":"}"},{"Add":""},{"Add":"/// The standard pretty-print"},{"Add":"impl std::fmt::Display for LogEntry {"},{"Add":" fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" if let Some(ref h) = self.hash {"},{"Add":" writeln!(f, \"Change {}\", h)?;"},{"Add":" }"},{"Add":" if let Some(ref authors) = self.authors {"},{"Add":" write!(f, \"Author: \")?;"},{"Add":" let mut is_first = true;"},{"Add":" for a in authors.iter() {"},{"Add":" if is_first {"},{"Add":" is_first = false;"},{"Add":" write!(f, \"{}\", a)?;"},{"Add":" } else {"},{"Add":" write!(f, \", {}\", a)?;"},{"Add":" }"},{"Add":" }"},{"Add":" // Write a linebreak after finishing the list of authors."},{"Add":" writeln!(f)?;"},{"Add":" }"},{"Add":""},{"Add":" if let Some(ref timestamp) = self.timestamp {"},{"Add":" writeln!(f, \"Date: {}\", timestamp)?;"},{"Add":" }"},{"Add":" if let Some(ref mrk) = self.state {"},{"Add":" writeln!(f, \"State: {}\", mrk)?;"},{"Add":" }"},{"Add":" if let Some(ref message) = self.message {"},{"Add":" writeln!(f, \"\\n {}\\n\", message)?;"},{"Add":" }"},{"Add":" if let Some(ref description) = self.description {"},{"Add":" writeln!(f, \"\\n {}\\n\", description)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Contains state needed to produce the sequence of [`LogEntry`] items"},{"Add":"/// that are to be logged. The implementation of `TryFrom` provides"},{"Add":"/// a fallible way of creating one of these from the CLI's [`Log`] structure."},{"Add":"///"},{"Add":"/// The two main things this provides are an efficient/streaming implementation"},{"Add":"/// of [`serde::Serialize`], and an implementation of [`std::fmt::Display`] that"},{"Add":"/// does the standard pretty-printing to stdout."},{"Add":"///"},{"Add":"/// The [`LogIterator::for_each`] method lets us reuse the most code while providing both"},{"Add":"/// pretty-printing and efficient serialization; we can't easily do this with"},{"Add":"/// a full implementation of Iterator because serde's serialize method requires"},{"Add":"/// self to be an immutable reference."},{"Add":"struct LogIterator {"},{"Add":" txn: Txn,"},{"Add":" changes: libpijul::changestore::filesystem::FileSystem,"},{"Add":" cmd: Log,"},{"Add":" repo_path: PathBuf,"},{"Add":" id_path: PathBuf,"},{"Add":" channel_ref: ChannelRef,"},{"Add":" limit: usize,"},{"Add":" offset: usize,"},{"Add":"}"},{"Add":""},{"Add":"/// This implementation of Serialize is hand-rolled in order"},{"Add":"/// to allow for greater re-use and efficiency."},{"Add":"impl Serialize for LogIterator {"},{"Add":" fn serialize(&self, serializer: S) -> Result"},{"Add":" where"},{"Add":" S: Serializer,"},{"Add":" {"},{"Add":" let mut seq = serializer.serialize_seq(None)?;"},{"Add":" match self.for_each(|entry| seq.serialize_element(&entry)) {"},{"Add":" Ok(_) => seq.end(),"},{"Add":" Err(anyhow_err) => Err(serde::ser::Error::custom(format!(\"{}\", anyhow_err))),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Pretty-prints all of the requested log entries in the standard"},{"Add":"/// user-facing format."},{"Add":"impl std::fmt::Display for LogIterator {"},{"Add":" fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" match self.for_each(|entry| write!(f, \"{}\", entry)) {"},{"Add":" Err(e) => {"},{"Add":" log::error!(\"LogIterator::Display: {}\", e);"},{"Add":" Err(std::fmt::Error)"},{"Add":" }"},{"Add":" _ => Ok(()),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl TryFrom for LogIterator {"},{"Add":" type Error = anyhow::Error;"},{"Add":" fn try_from(cmd: Log) -> Result {"},{"Add":" let repo = Repository::find_root(cmd.repo_path.clone())?;"},{"Add":" let repo_path = repo.path.clone();"}],"del_contents":[{"Del":"impl Log {\n"},{"Del":" pub fn run(self) -> Result<(), anyhow::Error> {\n"},{"Del":" let repo = Repository::find_root(self.repo_path)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":262,"ins":{"up_context":[{"change":4,"pos":135052}],"down_context":[{"change":4,"pos":2523}],"flag":"BLOCK","start":8695,"end":8757,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135052},"to":{"change":4,"start":2460,"end":2523},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":" let channel_name = if let Some(ref c) = cmd.channel {"}],"del_contents":[{"Del":" let channel_name = if let Some(ref c) = self.channel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":267,"ins":{"up_context":[{"change":4,"pos":2633}],"down_context":[{"change":4,"pos":135251}],"flag":"BLOCK","start":8758,"end":9334,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":701},"to":{"change":4,"start":16944,"end":17023},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":2252},"to":{"change":4,"start":16944,"end":17023},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":2633},"to":{"change":4,"start":16944,"end":17023},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135173},"to":{"change":4,"start":16944,"end":17023},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":" // The only situation that's disallowed is if the user's trying to apply"},{"Add":" // path filters AND get the logs for a channel other than the one they're"},{"Add":" // currently using (where using means the one that comprises the working copy)"},{"Add":" if !cmd.filters.is_empty()"},{"Add":" && !(channel_name == txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL))"},{"Add":" {"},{"Add":" bail!(\"Currently, log filters can only be applied to the channel currently in use.\")"},{"Add":" }"},{"Add":""},{"Add":" let channel_ref = if let Some(channel) = txn.load_channel(channel_name)? {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = txn.load_channel(channel_name)? {\n"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":281,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135434},"to":{"change":4,"start":163,"end":187},"introduced_by":4}],"inode":{"change":4,"pos":134376}}},"contents":[{"Del":" super::pager();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":282,"ins":{"up_context":[{"change":4,"pos":135470}],"down_context":[{"change":4,"pos":135674}],"flag":"BLOCK","start":9335,"end":12071,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135470},"to":{"change":4,"start":135470,"end":135514},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135514},"to":{"change":3,"start":0,"end":106},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":106},"to":{"change":4,"start":135514,"end":135542},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135514},"to":{"change":4,"start":135514,"end":135542},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135542},"to":{"change":3,"start":107,"end":132},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":132},"to":{"change":3,"start":132,"end":216},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":216},"to":{"change":3,"start":216,"end":259},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":259},"to":{"change":4,"start":12912,"end":12969},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":4,"pos":13027},"to":{"change":4,"start":12912,"end":12969},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":19445},"to":{"change":4,"start":12912,"end":12969},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17147},"to":{"change":4,"start":12912,"end":12969},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":74},"to":{"change":4,"start":135619,"end":135674},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":12969},"to":{"change":4,"start":135619,"end":135674},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":17181},"to":{"change":4,"start":135619,"end":135674},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135619},"to":{"change":4,"start":135619,"end":135674},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":" let limit = cmd.limit.unwrap_or(std::usize::MAX);"},{"Add":" let offset = cmd.offset.unwrap_or(0);"},{"Add":""},{"Add":" let mut id_path = repo.path.join(libpijul::DOT_DIR);"},{"Add":" id_path.push(\"identities\");"},{"Add":" Ok(Self {"},{"Add":" txn,"},{"Add":" cmd,"},{"Add":" changes,"},{"Add":" repo_path,"},{"Add":" id_path,"},{"Add":" channel_ref,"},{"Add":" limit,"},{"Add":" offset,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":"impl LogIterator {"},{"Add":" /// Call `f` on each [`LogEntry`] in a [`LogIterator`]."},{"Add":" ///"},{"Add":" /// The purpose of this is to let us execute a function over the log entries"},{"Add":" /// without having to duplicate the iteration/filtering logic or"},{"Add":" /// having to collect all of the elements first."},{"Add":" fn for_each("},{"Add":" &self,"},{"Add":" mut f: impl FnMut(LogEntry) -> Result,"},{"Add":" ) -> Result<(), anyhow::Error>"},{"Add":" where"},{"Add":" E: std::fmt::Display,"},{"Add":" {"},{"Add":" // A cache of authors to keys. Prevents us from having to do"},{"Add":" // a lot of file-io for looking up the same author multiple times."},{"Add":" let mut authors = HashMap::new();"},{"Add":" let mut id_path = self.id_path.clone();"},{"Add":" // If the user applied path filters, figure out what change hashes"},{"Add":" // are to be logged."},{"Add":" let mut requested_hashes = filtered_hashes("},{"Add":" &self.txn,"},{"Add":" self.repo_path.as_ref(),"},{"Add":" self.cmd.filters.as_slice(),"},{"Add":" )?;"},{"Add":""},{"Add":" // Get the (Hash, Merkle) pairs for the portion of reverse_log"},{"Add":" // that are between offset and limit."},{"Add":" let hs = self"},{"Add":" .txn"},{"Add":" .reverse_log(&*self.channel_ref.read(), None)?"},{"Add":" .skip(self.offset)"},{"Add":" .take(self.limit)"},{"Add":" .map(|res| {"},{"Add":" res.map(|(_, (ser_h, ser_m))| {"},{"Add":" (libpijul::Hash::from(ser_h), libpijul::Merkle::from(ser_m))"},{"Add":" })"},{"Add":" });"},{"Add":""},{"Add":" for pr in hs {"},{"Add":" let (h, mrk) = pr?;"},{"Add":" if (self.cmd.filters.is_empty()) || requested_hashes.remove(&h) {"},{"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 = self.mk_log_entry(&mut authors, &mut id_path, h, Some(mrk))?;"},{"Add":" if let Err(e) = f(entry) {"},{"Add":" return Err(anyhow::Error::msg(format!(\"{}\", e)));"},{"Add":" }"},{"Add":" } else if requested_hashes.is_empty() {"},{"Add":" // If the user applied path filters, but the relevant change hashes"},{"Add":" // have been exhausted, we can break early."},{"Add":" break;"},{"Add":" } else {"},{"Add":" // The user applied path filters; this wasn't a hit, but"},{"Add":" // there are still hits to be logged."},{"Add":" continue;"}],"del_contents":[{"Del":" let mut stdout = std::io::stdout();\n"},{"Del":" let limit = self.limit.unwrap_or(std::usize::MAX);\n let offset = self.offset.unwrap_or(0);\n"},{"Del":" if self.hash_only {\n"},{"Del":" for h in txn\n"},{"Del":" .reverse_log(&*channel.read(), None)?\n .skip(offset)\n"},{"Del":" .take(limit)\n {\n"},{"Del":" let h: libpijul::Hash = (h?.1).0.into();\n"},{"Del":" writeln!(stdout, \"{}\", h.to_base32())?\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":355,"ins":{"up_context":[{"change":4,"pos":135688}],"down_context":[{"change":4,"pos":985}],"flag":"BLOCK","start":12072,"end":12082,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135688},"to":{"change":4,"start":135688,"end":135743},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135743},"to":{"change":4,"start":726,"end":772},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":772},"to":{"change":4,"start":21109,"end":21214},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" } else {\n let states = self.states;\n"},{"Del":" let mut authors = HashMap::new();\n"},{"Del":" let mut id_path = repo.path.join(libpijul::DOT_DIR);\n id_path.push(\"identities\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":357,"ins":{"up_context":[{"change":4,"pos":986}],"down_context":[{"change":4,"pos":22007}],"flag":"BLOCK","start":12083,"end":13225,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":986},"to":{"change":3,"start":260,"end":412},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":412},"to":{"change":4,"start":17247,"end":17284},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":4,"pos":13092},"to":{"change":4,"start":17247,"end":17284},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":19511},"to":{"change":4,"start":17247,"end":17284},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17247},"to":{"change":4,"start":17247,"end":17284},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17284},"to":{"change":4,"start":12970,"end":13137},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":54},"to":{"change":4,"start":135873,"end":135936},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":13137},"to":{"change":4,"start":135873,"end":135936},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135873},"to":{"change":4,"start":135873,"end":135936},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":135936},"to":{"change":4,"start":987,"end":1073},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1073},"to":{"change":4,"start":21215,"end":21695},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":21695},"to":{"change":4,"start":1532,"end":1839},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1532},"to":{"change":4,"start":1532,"end":1839},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1839},"to":{"change":4,"start":21696,"end":22007},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" /// Create a [`LogEntry`] for a given hash."},{"Add":" ///"},{"Add":" /// Most of this is just getting the right key information from either the cache"},{"Add":" /// or from the relevant file."},{"Add":" fn mk_log_entry<'x>("},{"Add":" &self,"},{"Add":" author_kvs: &'x mut HashMap,"},{"Add":" id_path: &mut PathBuf,"},{"Add":" h: libpijul::Hash,"},{"Add":" m: Option,"},{"Add":" ) -> Result {"},{"Add":" let header = self.changes.get_header(&h.into())?;"},{"Add":" let authors = header"},{"Add":" .authors"},{"Add":" .into_iter()"},{"Add":" .map(|mut auth| {"},{"Add":" let auth = if let Some(k) = auth.0.remove(\"key\") {"},{"Add":" match author_kvs.entry(k) {"},{"Add":" Entry::Occupied(e) => e.into_mut(),"},{"Add":" Entry::Vacant(e) => {"},{"Add":" let mut id = None;"},{"Add":" id_path.push(e.key());"},{"Add":" if let Ok(f) = std::fs::File::open(&self.id_path) {"},{"Add":" if let Ok(id_) = serde_json::from_reader::<_, super::Identity>(f) {"},{"Add":" id = Some(id_)"}],"del_contents":[{"Del":" for h in txn\n .reverse_log(&*channel.read(), None)?\n .skip(offset)\n .take(limit)\n {\n"},{"Del":" let (h, mrk) = h?.1;\n"},{"Del":" let h: libpijul::Hash = h.into();\n let mrk: libpijul::Merkle = mrk.into();\n let header = changes.get_header(&h.into())?;\n"},{"Del":" writeln!(stdout, \"Change {}\", h.to_base32())?;\n"},{"Del":" write!(stdout, \"Author: \")?;\n let mut is_first = true;\n"},{"Del":" for mut auth in header.authors.into_iter() {\n let auth = if let Some(k) = auth.0.remove(\"key\") {\n match authors.entry(k) {\n Entry::Occupied(e) => e.into_mut(),\n Entry::Vacant(e) => {\n let mut id = None;\n id_path.push(e.key());\n if let Ok(f) = std::fs::File::open(&id_path) {\n"},{"Del":" if let Ok(id_) =\n serde_json::from_reader::<_, super::Identity>(f)\n {\n id = Some(id_)\n }\n }\n"},{"Del":" id_path.pop();\n if let Some(id) = id {\n e.insert(id.login)\n } else {\n let k = e.key().to_string();\n e.insert(k)\n"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":386,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":22041}],"down_context":[{"change":4,"pos":2153}],"flag":"BLOCK","start":13226,"end":13543,"inode":{"change":4,"pos":134376}}},"contents":[{"Add":" }"},{"Add":" id_path.pop();"},{"Add":" if let Some(id) = id {"},{"Add":" e.insert(id.login)"},{"Add":" } else {"},{"Add":" let k = e.key().to_string();"},{"Add":" e.insert(k)"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":395,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2209},"to":{"change":4,"start":22042,"end":22123},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":22123},"to":{"change":4,"start":2209,"end":2445},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2209},"to":{"change":4,"start":2209,"end":2445},"introduced_by":4}],"inode":{"change":4,"pos":134376}}},"contents":[{"Del":" } else {\n auth.0.get(\"name\").unwrap()\n"},{"Del":" };\n if is_first {\n is_first = false;\n write!(stdout, \"{}\", auth)?;\n } else {\n write!(stdout, \", {}\", auth)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":396,"ins":{"up_context":[{"change":4,"pos":2467}],"down_context":[{"change":4,"pos":136485}],"flag":"BLOCK","start":13544,"end":14683,"inode":{"change":4,"pos":134376}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2467},"to":{"change":4,"start":2467,"end":2485},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2485},"to":{"change":4,"start":2485,"end":2520},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":2520},"to":{"change":4,"start":122,"end":187},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":122},"to":{"change":4,"start":122,"end":187},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":187},"to":{"change":4,"start":136082,"end":136179},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136082},"to":{"change":4,"start":136082,"end":136179},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136179},"to":{"change":4,"start":136179,"end":136197},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136197},"to":{"change":4,"start":188,"end":253},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":253},"to":{"change":4,"start":136269,"end":136308},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136269},"to":{"change":4,"start":136269,"end":136308},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136308},"to":{"change":4,"start":254,"end":320},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":320},"to":{"change":4,"start":136381,"end":136445},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136381},"to":{"change":4,"start":136381,"end":136445},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136445},"to":{"change":4,"start":136445,"end":136467},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":136467},"to":{"change":4,"start":136467,"end":136485},"introduced_by":4}],"inode":{"change":4,"pos":134376}},"ins_contents":[{"Add":" } else {"},{"Add":" auth.0.get(\"name\").unwrap()"},{"Add":" };"},{"Add":" auth.to_owned()"},{"Add":" })"},{"Add":" .collect();"},{"Add":" Ok(LogEntry {"},{"Add":" hash: Some(h.to_base32()),"},{"Add":" state: m.map(|mm| mm.to_base32()).filter(|_| self.cmd.states),"},{"Add":" authors: Some(authors),"},{"Add":" timestamp: Some(header.timestamp),"},{"Add":" message: Some(header.message.clone()),"},{"Add":" description: header.description,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Log {"},{"Add":" // In order to accommodate both pretty-printing and efficient serialization to a serde"},{"Add":" // target format, this now delegates mostly to [`LogIterator`]."},{"Add":" pub fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" match self.output_format.as_ref().map(|s| s.as_str()) {"},{"Add":" Some(s) if s.eq_ignore_ascii_case(\"json\") => {"},{"Add":" serde_json::to_writer_pretty(&mut stdout, &LogIterator::try_from(self)?)?"},{"Add":" }"},{"Add":" _ => {"},{"Add":" super::pager();"},{"Add":" LogIterator::try_from(self)?.for_each(|entry| write!(&mut stdout, \"{}\", entry))?"}],"del_contents":[{"Del":" }\n"},{"Del":" writeln!(stdout)?;\n"},{"Del":" writeln!(stdout, \"Date: {}\", header.timestamp)?;\n"},{"Del":" if states {\n writeln!(stdout, \"State: {}\", mrk.to_base32())?;\n"},{"Del":" }\n"},{"Del":" writeln!(stdout, \"\\n {}\\n\", header.message)?;\n"},{"Del":" if self.descriptions {\n"},{"Del":" if let Some(ref descr) = header.description {\n"},{"Del":" writeln!(stdout, \"\\n {}\\n\", descr)?;\n"},{"Del":" }\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":430,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":46},"to":{"change":4,"start":2105,"end":2141},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":134515},"to":{"change":4,"start":2105,"end":2141},"introduced_by":4}],"inode":{"change":4,"pos":134376}}},"contents":[{"Del":"\nuse crate::repository::Repository;\n"}]}},{"SolveOrderConflict":{"inode":{"change":4,"pos":134376},"path":"pijul/src/commands/log.rs","line":430,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":136532}],"down_context":[],"flag":"","start":14684,"end":14684,"inode":{"change":4,"pos":134376}}},"contents":[]}}],"owner":"irevoire","repo":"pijul","token":"mAmAvGSa4S9+4zzGDOwoz2j3a4whWG+QT5PJ2t/r82A=","login":null}

…

Dependencies

Change contents