Mercurial > public > mercurial-scm > hg-stable
view rust/hg-core/src/operations/dirstate_status.rs @ 46063:dacb771f6dd2
copies-rust: extract the processing of a ChangedFiles in its own function
This is a reasonably independent piece of code that we can extract in its own
function. This extraction will be very useful for the next changeset, where we
will change the iteration order (but still do the same kind of processing).
Differential Revision: https://phab.mercurial-scm.org/D9421
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Nov 2020 14:17:08 +0100 |
parents | fd47483f1645 |
children | 441024b279a6 |
line wrap: on
line source
// dirstate_status.rs // // Copyright 2019, Raphaël Gomès <rgomes@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::dirstate::status::{build_response, Dispatch, HgPathCow, Status}; use crate::matchers::Matcher; use crate::{DirstateStatus, StatusError}; /// A tuple of the paths that need to be checked in the filelog because it's /// ambiguous whether they've changed, and the rest of the already dispatched /// files. pub type LookupAndStatus<'a> = (Vec<HgPathCow<'a>>, DirstateStatus<'a>); #[cfg(feature = "dirstate-tree")] impl<'a, M: Matcher + Sync> Status<'a, M> { pub(crate) fn run(&self) -> Result<LookupAndStatus<'a>, StatusError> { let (traversed_sender, traversed_receiver) = crossbeam_channel::unbounded(); // Step 1: check the files explicitly mentioned by the user let (work, mut results) = self.walk_explicit(traversed_sender.clone()); // Step 2: Check files in the dirstate if !self.matcher.is_exact() { self.extend_from_dmap(&mut results); } // Step 3: Check the working directory if listing unknowns if !work.is_empty() { // Hashmaps are quite a bit slower to build than vecs, so only // build it if needed. let mut old_results = None; // Step 2: recursively check the working directory for changes if // needed for (dir, dispatch) in work { match dispatch { Dispatch::Directory { was_file } => { if was_file { results.push((dir.to_owned(), Dispatch::Removed)); } if self.options.list_ignored || self.options.list_unknown && !self.dir_ignore(&dir) { if old_results.is_none() { old_results = Some(results.iter().cloned().collect()); } self.traverse( &dir, old_results .as_ref() .expect("old results should exist"), &mut results, traversed_sender.clone(), ); } } _ => { unreachable!("There can only be directories in `work`") } } } } drop(traversed_sender); let traversed = traversed_receiver.into_iter().collect(); Ok(build_response(results, traversed)) } } #[cfg(not(feature = "dirstate-tree"))] impl<'a, M: Matcher + Sync> Status<'a, M> { pub(crate) fn run(&self) -> Result<LookupAndStatus<'a>, StatusError> { let (traversed_sender, traversed_receiver) = crossbeam_channel::unbounded(); // Step 1: check the files explicitly mentioned by the user let (work, mut results) = self.walk_explicit(traversed_sender.clone()); if !work.is_empty() { // Hashmaps are quite a bit slower to build than vecs, so only // build it if needed. let old_results = results.iter().cloned().collect(); // Step 2: recursively check the working directory for changes if // needed for (dir, dispatch) in work { match dispatch { Dispatch::Directory { was_file } => { if was_file { results.push((dir.to_owned(), Dispatch::Removed)); } if self.options.list_ignored || self.options.list_unknown && !self.dir_ignore(&dir) { self.traverse( &dir, &old_results, &mut results, traversed_sender.clone(), ); } } _ => { unreachable!("There can only be directories in `work`") } } } } if !self.matcher.is_exact() { if self.options.list_unknown { self.handle_unknowns(&mut results); } else { // TODO this is incorrect, see issue6335 // This requires a fix in both Python and Rust that can happen // with other pending changes to `status`. self.extend_from_dmap(&mut results); } } drop(traversed_sender); let traversed = traversed_receiver.into_iter().collect(); Ok(build_response(results, traversed)) } }