Mercurial > hg
view rust/hg-core/src/operations/cat.rs @ 48237:027ebad952ac
rhg: internally, return a structured representation from hg cat
The purpose of this change is to make it possible to support limited templating in `hg cat`, so we could print separators between files etc.
The templating itself is not implemented yet, so this functionality is unused in `rhg cat`.
However, in our fork of hg we're implementing a slightly different command `hg jscat` which makes use of this.
So accepting this change will let us minimize the size of the patch we're maintaining on our side.
Differential Revision: https://phab.mercurial-scm.org/D11679
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Fri, 15 Oct 2021 14:05:20 +0100 |
parents | 1837663ac216 |
children | 10c32e1b892a |
line wrap: on
line source
// list_tracked_files.rs // // Copyright 2020 Antoine Cezar <antoine.cezar@octobus.net> // // This software may be used and distributed according to the terms of the // GNU General Public License version 2 or any later version. use crate::repo::Repo; use crate::revlog::revlog::RevlogError; use crate::revlog::Node; use crate::utils::hg_path::HgPath; use itertools::put_back; use itertools::PutBack; use std::cmp::Ordering; pub struct CatOutput<'a> { /// Whether any file in the manifest matched the paths given as CLI /// arguments pub found_any: bool, /// The contents of matching files, in manifest order pub results: Vec<(&'a HgPath, Vec<u8>)>, /// Which of the CLI arguments did not match any manifest file pub missing: Vec<&'a HgPath>, /// The node ID that the given revset was resolved to pub node: Node, } // Find an item in an iterator over a sorted collection. fn find_item<'a, 'b, 'c, D, I: Iterator<Item = (&'a HgPath, D)>>( i: &mut PutBack<I>, needle: &'b HgPath, ) -> Option<D> { loop { match i.next() { None => return None, Some(val) => match needle.as_bytes().cmp(val.0.as_bytes()) { Ordering::Less => { i.put_back(val); return None; } Ordering::Greater => continue, Ordering::Equal => return Some(val.1), }, } } } fn find_files_in_manifest< 'manifest, 'query, Data, Manifest: Iterator<Item = (&'manifest HgPath, Data)>, Query: Iterator<Item = &'query HgPath>, >( manifest: Manifest, query: Query, ) -> (Vec<(&'query HgPath, Data)>, Vec<&'query HgPath>) { let mut manifest = put_back(manifest); let mut res = vec![]; let mut missing = vec![]; for file in query { match find_item(&mut manifest, file) { None => missing.push(file), Some(item) => res.push((file, item)), } } return (res, missing); } /// Output the given revision of files /// /// * `root`: Repository root /// * `rev`: The revision to cat the files from. /// * `files`: The files to output. pub fn cat<'a>( repo: &Repo, revset: &str, mut files: Vec<&'a HgPath>, ) -> Result<CatOutput<'a>, RevlogError> { let rev = crate::revset::resolve_single(revset, repo)?; let manifest = repo.manifest_for_rev(rev)?; let node = *repo .changelog()? .node_from_rev(rev) .expect("should succeed when repo.manifest did"); let mut results: Vec<(&'a HgPath, Vec<u8>)> = vec![]; let mut found_any = false; files.sort_unstable(); let (found, missing) = find_files_in_manifest( manifest.files_with_nodes(), files.into_iter().map(|f| f.as_ref()), ); for (file_path, node_bytes) in found { found_any = true; let file_log = repo.filelog(file_path)?; let file_node = Node::from_hex_for_repo(node_bytes)?; results.push(( file_path, file_log.data_for_node(file_node)?.into_data()?, )); } Ok(CatOutput { found_any, results, missing, node, }) }