This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10803

rhg: Remove some intermediate Vecs in `rhg files`
ClosedPublic

Authored by SimonSapin on May 31 2021, 8:26 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd2fb8b4adcc3: rhg: Remove some intermediate Vecs in `rhg files`
Summary

Instead of calling parse_dirstate which then calls parse_dirstate_entries,
call the latter directly in order to skip some intermediate steps.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.May 31 2021, 8:26 AM
Alphare accepted this revision.Jun 3 2021, 4:48 AM
This revision is now accepted and ready to land.Jun 3 2021, 4:48 AM
pulkit accepted this revision.Jun 4 2021, 5:58 AM
SimonSapin added a commit: rHGd2fb8b4adcc3: rhg: Remove some intermediate Vecs in `rhg files`.Jun 7 2021, 3:44 AM
Closed by commit rHGd2fb8b4adcc3: rhg: Remove some intermediate Vecs in `rhg files` (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28461

rust/hg-core/src/operations/list_tracked_files.rs

// list_tracked_files.rs // list_tracked_files.rs
// //
// Copyright 2020 Antoine Cezar <antoine.cezar@octobus.net> // Copyright 2020 Antoine Cezar <antoine.cezar@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use crate::dirstate::parsers::parse_dirstate; use crate::dirstate::parsers::parse_dirstate_entries;
use crate::errors::HgError; use crate::errors::HgError;
use crate::repo::Repo; use crate::repo::Repo;
use crate::revlog::changelog::Changelog; use crate::revlog::changelog::Changelog;
use crate::revlog::manifest::{Manifest, ManifestEntry}; use crate::revlog::manifest::{Manifest, ManifestEntry};
use crate::revlog::node::Node; use crate::revlog::node::Node;
use crate::revlog::revlog::RevlogError; use crate::revlog::revlog::RevlogError;
use crate::utils::hg_path::HgPath; use crate::utils::hg_path::HgPath;
use crate::EntryState;
use rayon::prelude::*; use rayon::prelude::*;
/// List files under Mercurial control in the working directory /// List files under Mercurial control in the working directory
/// by reading the dirstate /// by reading the dirstate
pub struct Dirstate { pub struct Dirstate {
/// The `dirstate` content. /// The `dirstate` content.
content: Vec<u8>, content: Vec<u8>,
} }
impl Dirstate { impl Dirstate {
pub fn new(repo: &Repo) -> Result<Self, HgError> { pub fn new(repo: &Repo) -> Result<Self, HgError> {
let content = repo.hg_vfs().read("dirstate")?; let content = repo.hg_vfs().read("dirstate")?;
Ok(Self { content }) Ok(Self { content })
} }
pub fn tracked_files(&self) -> Result<Vec<&HgPath>, HgError> { pub fn tracked_files(&self) -> Result<Vec<&HgPath>, HgError> {
let (_, entries, _) = parse_dirstate(&self.content)?; let mut files = Vec::new();
let mut files: Vec<&HgPath> = entries let _parents = parse_dirstate_entries(
.into_iter() &self.content,
.filter_map(|(path, entry)| match entry.state { |path, entry, _copy_source| {
EntryState::Removed => None, if entry.state.is_tracked() {
_ => Some(path), files.push(path)
}) }
.collect(); Ok(())
},
)?;
files.par_sort_unstable(); files.par_sort_unstable();
Ok(files) Ok(files)
} }
} }
/// List files under Mercurial control at a given revision. /// List files under Mercurial control at a given revision.
pub fn list_rev_tracked_files( pub fn list_rev_tracked_files(
repo: &Repo, repo: &Repo,