##// END OF EJS Templates
rhg: Propogate manifest parse errors instead of panicking...
rhg: Propogate manifest parse errors instead of panicking The Rust parser for the manifest file format is an iterator. Now every item from that iterator is a `Result`, which makes error handling required in multiple new places. This makes better recovery on errors possible, compare to a run time panic. Differential Revision: https://phab.mercurial-scm.org/D11771

File last commit:

r49165:10c32e1b default
r49165:10c32e1b default
Show More
cat.rs
119 lines | 3.3 KiB | application/rls-services+xml | RustLexer
// 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 crate::errors::HgError;
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, D, I: Iterator<Item = Result<(&'a HgPath, D), HgError>>>(
i: &mut PutBack<I>,
needle: &HgPath,
) -> Result<Option<D>, HgError> {
loop {
match i.next() {
None => return Ok(None),
Some(result) => {
let (path, value) = result?;
match needle.as_bytes().cmp(path.as_bytes()) {
Ordering::Less => {
i.put_back(Ok((path, value)));
return Ok(None);
}
Ordering::Greater => continue,
Ordering::Equal => return Ok(Some(value)),
}
}
}
}
}
fn find_files_in_manifest<
'manifest,
'query,
Data,
Manifest: Iterator<Item = Result<(&'manifest HgPath, Data), HgError>>,
Query: Iterator<Item = &'query HgPath>,
>(
manifest: Manifest,
query: Query,
) -> Result<(Vec<(&'query HgPath, Data)>, Vec<&'query HgPath>), HgError> {
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 Ok((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,
})
}