rust/rhg/src/commands/status.rs

48342:10c32e1b892a

fn cat_file_is_modified(
    repo: &Repo,
    manifest: &Manifest,
    hg_path: &HgPath,
) -> Result<bool, HgError> {
    let file_node = manifest
        .find_file(hg_path)?
        .expect("ambgious file not in p1");
    let filelog = repo.filelog(hg_path)?;
    let filelog_entry = filelog.data_for_node(file_node).map_err(|_| {
        HgError::corrupted("filelog missing node from manifest")
    })?;
    let contents_in_p1 = filelog_entry.data()?;

    let fs_path = hg_path_to_os_string(hg_path).expect("HgPath conversion");
    let fs_contents = repo.working_directory_vfs().read(fs_path)?;
    return Ok(contents_in_p1 != &*fs_contents);

48343:eb428010aad2

fn cat_file_is_modified(
    repo: &Repo,
    manifest: &Manifest,
    hg_path: &HgPath,
) -> Result<bool, HgError> {
    let entry = manifest
        .find_file(hg_path)?
        .expect("ambgious file not in p1");
    let filelog = repo.filelog(hg_path)?;
    let filelog_entry =
        filelog.data_for_node(entry.node_id()?).map_err(|_| {
            HgError::corrupted("filelog missing node from manifest")
        })?;
    let contents_in_p1 = filelog_entry.data()?;

    let fs_path = hg_path_to_os_string(hg_path).expect("HgPath conversion");
    let fs_contents = repo.working_directory_vfs().read(fs_path)?;
    return Ok(contents_in_p1 != &*fs_contents);