Mercurial > public > mercurial-scm > hg
view rust/hg-core/src/operations/cat.rs @ 48224:6b5773f89183
rhg: faster hg cat when many files are requested
With this patch I'm seeing a ~39ms improvement (220ms -> 181ms) when
running [hg cat] on ~220 files in a ~260k-file repo.
The timing for [hg cat] on an individual file becomes slightly worse
(losing 5ms: 145ms -> 150ms).
A follow-up commit is intended to improve that.
Differential Revision: https://phab.mercurial-scm.org/D11615
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Mon, 04 Oct 2021 19:06:45 +0100 |
parents | 87e3f878e65f |
children | 0cc69017d47f |
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::HgPathBuf; use itertools::EitherOrBoth::{Both, Left, Right}; use itertools::Itertools; pub struct CatOutput { /// 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 concatenated: Vec<u8>, /// Which of the CLI arguments did not match any manifest file pub missing: Vec<HgPathBuf>, /// The node ID that the given revset was resolved to pub node: Node, } /// 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<HgPathBuf>, ) -> Result<CatOutput, 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 bytes = vec![]; let mut found_any = false; files.sort_unstable(); let mut missing = vec![]; for entry in manifest .files_with_nodes() .merge_join_by(files.iter(), |(manifest_file, _), file| { manifest_file.cmp(&file.as_ref()) }) { match entry { Left(_) => (), Right(path) => missing.push(path), Both((manifest_file, node_bytes), _) => { found_any = true; let file_log = repo.filelog(manifest_file)?; let file_node = Node::from_hex_for_repo(node_bytes)?; let entry = file_log.data_for_node(file_node)?; bytes.extend(entry.data()?) } } } let missing: Vec<HgPathBuf> = missing .iter() .map(|file| (*(file.as_ref())).to_owned()) .collect(); Ok(CatOutput { found_any, concatenated: bytes, missing, node, }) }