comparison rust/hg-core/src/operations/cat.rs @ 48343:eb428010aad2

rhg: Also parse flags in the manifest parser

Differential Revision: https://phab.mercurial-scm.org/D11772

48342:10c32e1b892a

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> {

    /// 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)? {

    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()?,
        ));
    }

48343:eb428010aad2

use crate::revlog::Node;

use crate::utils::hg_path::HgPath;

use crate::errors::HgError;
use crate::manifest::Manifest;
use crate::manifest::ManifestEntry;
use itertools::put_back;
use itertools::PutBack;
use std::cmp::Ordering;

pub struct CatOutput<'a> {

    /// 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>(
    i: &mut PutBack<impl Iterator<Item = Result<ManifestEntry<'a>, HgError>>>,
    needle: &HgPath,
) -> Result<Option<Node>, HgError> {
    loop {
        match i.next() {
            None => return Ok(None),
            Some(result) => {
                let entry = result?;
                match needle.as_bytes().cmp(entry.path.as_bytes()) {
                    Ordering::Less => {
                        i.put_back(Ok(entry));
                        return Ok(None);
                    }
                    Ordering::Greater => continue,
                    Ordering::Equal => return Ok(Some(entry.node_id()?)),
                }
            }
        }
    }
}

fn find_files_in_manifest<'query>(
    manifest: &Manifest,
    query: impl Iterator<Item = &'query HgPath>,
) -> Result<(Vec<(&'query HgPath, Node)>, Vec<&'query HgPath>), HgError> {
    let mut manifest = put_back(manifest.iter());
    let mut res = vec![];
    let mut missing = vec![];

    for file in query {
        match find_item(&mut manifest, file)? {

    let mut found_any = false;

    files.sort_unstable();

    let (found, missing) = find_files_in_manifest(
        &manifest,
        files.into_iter().map(|f| f.as_ref()),
    )?;

    for (file_path, file_node) in found {
        found_any = true;
        let file_log = repo.filelog(file_path)?;
        results.push((
            file_path,
            file_log.data_for_node(file_node)?.into_data()?,
        ));
    }