##// END OF EJS Templates
revlog: change _addrevision to return the new revision...
revlog: change _addrevision to return the new revision The node is passed as argument already, so returning it is quite pointless. The revision number on the other is useful as it decouples the caller from the revlog internals. Differential Revision: https://phab.mercurial-scm.org/D9880

File last commit:

r47244:d67732a4 merge default
r47256:07984507 default
Show More
status.rs
988 lines | 34.7 KiB | application/rls-services+xml | RustLexer
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 // 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.
//! Rust implementation of dirstate.status (dirstate.py).
//! It is currently missing a lot of functionality compared to the Python one
//! and will only be triggered in narrow cases.
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 #[cfg(feature = "dirstate-tree")]
use crate::dirstate::dirstate_tree::iter::StatusShortcut;
#[cfg(not(feature = "dirstate-tree"))]
use crate::utils::path_auditor::PathAuditor;
Raphaël Gomès
rust: introduce SIZE_FROM_OTHER_PARENT constant...
r44003 use crate::{
dirstate::SIZE_FROM_OTHER_PARENT,
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 filepatterns::PatternFileWarning,
matchers::{get_ignore_function, Matcher, VisitChildrenSet},
Raphaël Gomès
rust: introduce SIZE_FROM_OTHER_PARENT constant...
r44003 utils::{
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 files::{find_dirs, HgMetadata},
Raphaël Gomès
rust-status: add util for listing a directory...
r45010 hg_path::{
hg_path_to_path_buf, os_string_to_hg_path_buf, HgPath, HgPathBuf,
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 HgPathError,
Raphaël Gomès
rust-status: add util for listing a directory...
r45010 },
Raphaël Gomès
rust: introduce SIZE_FROM_OTHER_PARENT constant...
r44003 },
Raphaël Gomès
rust-status: add function for sequential traversal of the working directory...
r45014 CopyMap, DirstateEntry, DirstateMap, EntryState, FastHashMap,
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 PatternError,
Raphaël Gomès
rust: introduce SIZE_FROM_OTHER_PARENT constant...
r44003 };
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 use lazy_static::lazy_static;
Raphaël Gomès
hg-core: add function timing information...
r45028 use micro_timer::timed;
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 use rayon::prelude::*;
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 use std::{
borrow::Cow,
collections::HashSet,
Simon Sapin
rust: replace ToString impls with Display...
r47173 fmt,
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 fs::{read_dir, DirEntry},
io::ErrorKind,
ops::Deref,
Raphaël Gomès
rust-status: only involve ignore mechanism when needed...
r45088 path::{Path, PathBuf},
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 };
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 /// Wrong type of file from a `BadMatch`
/// Note: a lot of those don't exist on all platforms.
Raphaël Gomès
rust-status: move to recursive traversal to prepare for parallel traversal...
r45023 #[derive(Debug, Copy, Clone)]
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 pub enum BadType {
CharacterDevice,
BlockDevice,
FIFO,
Socket,
Directory,
Unknown,
}
Simon Sapin
rust: replace ToString impls with Display...
r47173 impl fmt::Display for BadType {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(match self {
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 BadType::CharacterDevice => "character device",
BadType::BlockDevice => "block device",
BadType::FIFO => "fifo",
BadType::Socket => "socket",
BadType::Directory => "directory",
BadType::Unknown => "unknown",
Simon Sapin
rust: replace ToString impls with Display...
r47173 })
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 }
}
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 /// Was explicitly matched but cannot be found/accessed
Raphaël Gomès
rust-status: move to recursive traversal to prepare for parallel traversal...
r45023 #[derive(Debug, Copy, Clone)]
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 pub enum BadMatch {
OsError(i32),
BadType(BadType),
}
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// Enum used to dispatch new status entries into the right collections.
Raphaël Gomès
rust-status: improve status performance...
r44000 /// Is similar to `crate::EntryState`, but represents the transient state of
/// entries during the lifetime of a command.
Raphaël Gomès
rust-status: move to recursive traversal to prepare for parallel traversal...
r45023 #[derive(Debug, Copy, Clone)]
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 pub enum Dispatch {
Raphaël Gomès
rust-status: improve status performance...
r44000 Unsure,
Modified,
Added,
Removed,
Deleted,
Clean,
Unknown,
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 Ignored,
/// Empty dispatch, the file is not worth listing
None,
/// Was explicitly matched but cannot be found/accessed
Bad(BadMatch),
Directory {
/// True if the directory used to be a file in the dmap so we can say
/// that it's been removed.
was_file: bool,
},
Raphaël Gomès
rust-status: improve status performance...
r44000 }
Raphaël Gomès
rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait...
r44367 type IoResult<T> = std::io::Result<T>;
Raphaël Gomès
rust-status: improve documentation and readability...
r45672
Raphaël Gomès
rust-status: only involve ignore mechanism when needed...
r45088 /// `Box<dyn Trait>` is syntactic sugar for `Box<dyn Trait, 'static>`, so add
/// an explicit lifetime here to not fight `'static` bounds "out of nowhere".
type IgnoreFnType<'a> = Box<dyn for<'r> Fn(&'r HgPath) -> bool + Sync + 'a>;
Raphaël Gomès
rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait...
r44367
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// We have a good mix of owned (from directory traversal) and borrowed (from
/// the dirstate/explicit) paths, this comes up a lot.
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 pub type HgPathCow<'a> = Cow<'a, HgPath>;
Raphaël Gomès
rust-status: improve documentation and readability...
r45672
/// A path with its computed ``Dispatch`` information
type DispatchedPath<'a> = (HgPathCow<'a>, Dispatch);
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 /// The conversion from `HgPath` to a real fs path failed.
/// `22` is the error code for "Invalid argument"
const INVALID_PATH_DISPATCH: Dispatch = Dispatch::Bad(BadMatch::OsError(22));
Raphaël Gomès
rust-status: refactor dispatch case for normal files...
r44002 /// Dates and times that are outside the 31-bit signed range are compared
/// modulo 2^31. This should prevent hg from behaving badly with very large
/// files or corrupt dates while still having a high probability of detecting
/// changes. (issue2608)
/// TODO I haven't found a way of having `b` be `Into<i32>`, since `From<u64>`
/// is not defined for `i32`, and there is no `As` trait. This forces the
/// caller to cast `b` as `i32`.
fn mod_compare(a: i32, b: i32) -> bool {
a & i32::max_value() != b & i32::max_value()
}
Raphaël Gomès
rust-status: add util for listing a directory...
r45010 /// Return a sorted list containing information about the entries
/// in the directory.
///
/// * `skip_dot_hg` - Return an empty vec if `path` contains a `.hg` directory
fn list_directory(
path: impl AsRef<Path>,
skip_dot_hg: bool,
) -> std::io::Result<Vec<(HgPathBuf, DirEntry)>> {
let mut results = vec![];
let entries = read_dir(path.as_ref())?;
for entry in entries {
let entry = entry?;
let filename = os_string_to_hg_path_buf(entry.file_name())?;
let file_type = entry.file_type()?;
if skip_dot_hg && filename.as_bytes() == b".hg" && file_type.is_dir() {
return Ok(vec![]);
} else {
Raphaël Gomès
rust: do a clippy pass...
r45500 results.push((filename, entry))
Raphaël Gomès
rust-status: add util for listing a directory...
r45010 }
}
results.sort_unstable_by_key(|e| e.0.clone());
Ok(results)
}
Raphaël Gomès
rust-status: improve status performance...
r44000 /// The file corresponding to the dirstate entry was found on the filesystem.
fn dispatch_found(
filename: impl AsRef<HgPath>,
entry: DirstateEntry,
metadata: HgMetadata,
copy_map: &CopyMap,
Raphaël Gomès
rust-status: refactor options into a `StatusOptions` struct...
r45011 options: StatusOptions,
Raphaël Gomès
rust-status: improve status performance...
r44000 ) -> Dispatch {
let DirstateEntry {
state,
mode,
mtime,
size,
} = entry;
let HgMetadata {
st_mode,
st_size,
st_mtime,
..
} = metadata;
match state {
EntryState::Normal => {
Raphaël Gomès
rust-status: refactor dispatch case for normal files...
r44002 let size_changed = mod_compare(size, st_size as i32);
Raphaël Gomès
rust-status: improve status performance...
r44000 let mode_changed =
Raphaël Gomès
rust-status: refactor options into a `StatusOptions` struct...
r45011 (mode ^ st_mode as i32) & 0o100 != 0o000 && options.check_exec;
Raphaël Gomès
rust-status: refactor dispatch case for normal files...
r44002 let metadata_changed = size >= 0 && (size_changed || mode_changed);
Raphaël Gomès
rust: introduce SIZE_FROM_OTHER_PARENT constant...
r44003 let other_parent = size == SIZE_FROM_OTHER_PARENT;
Raphaël Gomès
rust: do a clippy pass...
r45500
Raphaël Gomès
rust-status: refactor dispatch case for normal files...
r44002 if metadata_changed
|| other_parent
|| copy_map.contains_key(filename.as_ref())
Raphaël Gomès
rust-status: improve status performance...
r44000 {
Dispatch::Modified
Raphaël Gomès
rust: do a clippy pass...
r45500 } else if mod_compare(mtime, st_mtime as i32)
|| st_mtime == options.last_normal_time
{
Raphaël Gomès
rust-status: improve status performance...
r44000 // the file may have just been marked as normal and
// it may have changed in the same second without
// changing its size. This can happen if we quickly
// do multiple commits. Force lookup, so we don't
// miss such a racy file change.
Dispatch::Unsure
Raphaël Gomès
rust-status: refactor options into a `StatusOptions` struct...
r45011 } else if options.list_clean {
Raphaël Gomès
rust-status: improve status performance...
r44000 Dispatch::Clean
} else {
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 Dispatch::None
Raphaël Gomès
rust-status: improve status performance...
r44000 }
}
EntryState::Merged => Dispatch::Modified,
EntryState::Added => Dispatch::Added,
EntryState::Removed => Dispatch::Removed,
EntryState::Unknown => Dispatch::Unknown,
}
}
/// The file corresponding to this Dirstate entry is missing.
fn dispatch_missing(state: EntryState) -> Dispatch {
match state {
// File was removed from the filesystem during commands
EntryState::Normal | EntryState::Merged | EntryState::Added => {
Dispatch::Deleted
}
// File was removed, everything is normal
EntryState::Removed => Dispatch::Removed,
// File is unknown to Mercurial, everything is normal
EntryState::Unknown => Dispatch::Unknown,
}
}
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 fn dispatch_os_error(e: &std::io::Error) -> Dispatch {
Dispatch::Bad(BadMatch::OsError(
e.raw_os_error().expect("expected real OS error"),
))
}
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 lazy_static! {
static ref DEFAULT_WORK: HashSet<&'static HgPath> = {
let mut h = HashSet::new();
h.insert(HgPath::new(b""));
h
};
}
Raphaël Gomès
rust-status: refactor options into a `StatusOptions` struct...
r45011 #[derive(Debug, Copy, Clone)]
pub struct StatusOptions {
/// Remember the most recent modification timeslot for status, to make
/// sure we won't miss future size-preserving file content modifications
/// that happen within the same timeslot.
pub last_normal_time: i64,
/// Whether we are on a filesystem with UNIX-like exec flags
pub check_exec: bool,
pub list_clean: bool,
Raphaël Gomès
rust-status: add function for sequential traversal of the working directory...
r45014 pub list_unknown: bool,
pub list_ignored: bool,
Raphaël Gomès
rust-status: collect traversed directories if required...
r45353 /// Whether to collect traversed dirs for applying a callback later.
/// Used by `hg purge` for example.
pub collect_traversed_dirs: bool,
Raphaël Gomès
rust-status: add function for sequential traversal of the working directory...
r45014 }
Raphaël Gomès
rust-core: add missing `Debug` traits...
r45052 #[derive(Debug)]
Raphaël Gomès
rust-status: rename `StatusResult` to `DirstateStatus`...
r45012 pub struct DirstateStatus<'a> {
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 pub modified: Vec<HgPathCow<'a>>,
pub added: Vec<HgPathCow<'a>>,
pub removed: Vec<HgPathCow<'a>>,
pub deleted: Vec<HgPathCow<'a>>,
pub clean: Vec<HgPathCow<'a>>,
pub ignored: Vec<HgPathCow<'a>>,
pub unknown: Vec<HgPathCow<'a>>,
pub bad: Vec<(HgPathCow<'a>, BadMatch)>,
Raphaël Gomès
rust-status: collect traversed directories if required...
r45353 /// Only filled if `collect_traversed_dirs` is `true`
pub traversed: Vec<HgPathBuf>,
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 }
Simon Sapin
rust: replace trivial `impl From …` with `#[derive(derive_more::From)]`...
r47164 #[derive(Debug, derive_more::From)]
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 pub enum StatusError {
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// Generic IO error
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 IO(std::io::Error),
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// An invalid path that cannot be represented in Mercurial was found
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Path(HgPathError),
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// An invalid "ignore" pattern was found
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Pattern(PatternError),
}
pub type StatusResult<T> = Result<T, StatusError>;
Simon Sapin
rust: replace ToString impls with Display...
r47173 impl fmt::Display for StatusError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 match self {
Simon Sapin
rust: replace ToString impls with Display...
r47173 StatusError::IO(error) => error.fmt(f),
StatusError::Path(error) => error.fmt(f),
StatusError::Pattern(error) => error.fmt(f),
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
}
}
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// Gives information about which files are changed in the working directory
/// and how, compared to the revision we're based on
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 pub struct Status<'a, M: Matcher + Sync> {
dmap: &'a DirstateMap,
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 pub(crate) matcher: &'a M,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 root_dir: PathBuf,
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 pub(crate) options: StatusOptions,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 ignore_fn: IgnoreFnType<'a>,
}
impl<'a, M> Status<'a, M>
where
M: Matcher + Sync,
{
pub fn new(
dmap: &'a DirstateMap,
matcher: &'a M,
root_dir: PathBuf,
ignore_files: Vec<PathBuf>,
options: StatusOptions,
) -> StatusResult<(Self, Vec<PatternFileWarning>)> {
// Needs to outlive `dir_ignore_fn` since it's captured.
let (ignore_fn, warnings): (IgnoreFnType, _) =
if options.list_ignored || options.list_unknown {
get_ignore_function(ignore_files, &root_dir)?
} else {
(Box::new(|&_| true), vec![])
};
Ok((
Self {
dmap,
matcher,
root_dir,
options,
ignore_fn,
},
warnings,
))
}
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// Is the path ignored?
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 pub fn is_ignored(&self, path: impl AsRef<HgPath>) -> bool {
(self.ignore_fn)(path.as_ref())
}
/// Is the path or one of its ancestors ignored?
pub fn dir_ignore(&self, dir: impl AsRef<HgPath>) -> bool {
// Only involve ignore mechanism if we're listing unknowns or ignored.
if self.options.list_ignored || self.options.list_unknown {
if self.is_ignored(&dir) {
true
} else {
for p in find_dirs(dir.as_ref()) {
if self.is_ignored(p) {
return true;
}
}
false
}
} else {
true
}
}
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// Get stat data about the files explicitly specified by the matcher.
/// Returns a tuple of the directories that need to be traversed and the
/// files with their corresponding `Dispatch`.
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 /// TODO subrepos
#[timed]
pub fn walk_explicit(
&self,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 traversed_sender: crossbeam_channel::Sender<HgPathBuf>,
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 ) -> (Vec<DispatchedPath<'a>>, Vec<DispatchedPath<'a>>) {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 self.matcher
.file_set()
.unwrap_or(&DEFAULT_WORK)
.par_iter()
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .flat_map(|&filename| -> Option<_> {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 // TODO normalization
let normalized = filename;
let buf = match hg_path_to_path_buf(normalized) {
Ok(x) => x,
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Err(_) => {
return Some((
Cow::Borrowed(normalized),
INVALID_PATH_DISPATCH,
))
}
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 };
let target = self.root_dir.join(buf);
let st = target.symlink_metadata();
let in_dmap = self.dmap.get(normalized);
match st {
Ok(meta) => {
let file_type = meta.file_type();
return if file_type.is_file() || file_type.is_symlink()
{
if let Some(entry) = in_dmap {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 return Some((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Cow::Borrowed(normalized),
dispatch_found(
&normalized,
*entry,
HgMetadata::from_metadata(meta),
&self.dmap.copy_map,
self.options,
),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ));
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Some((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Cow::Borrowed(normalized),
Dispatch::Unknown,
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 } else if file_type.is_dir() {
if self.options.collect_traversed_dirs {
traversed_sender
.send(normalized.to_owned())
.expect("receiver should outlive sender");
}
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Some((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Cow::Borrowed(normalized),
Dispatch::Directory {
was_file: in_dmap.is_some(),
},
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 } else {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Some((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Cow::Borrowed(normalized),
Dispatch::Bad(BadMatch::BadType(
// TODO do more than unknown
// Support for all `BadType` variant
// varies greatly between platforms.
// So far, no tests check the type and
// this should be good enough for most
// users.
BadType::Unknown,
)),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 };
}
Err(_) => {
if let Some(entry) = in_dmap {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 return Some((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Cow::Borrowed(normalized),
dispatch_missing(entry.state),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ));
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
}
};
None
})
.partition(|(_, dispatch)| match dispatch {
Dispatch::Directory { .. } => true,
_ => false,
})
}
/// Walk the working directory recursively to look for changes compared to
/// the current `DirstateMap`.
///
/// This takes a mutable reference to the results to account for the
/// `extend` in timings
#[timed]
pub fn traverse(
&self,
path: impl AsRef<HgPath>,
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 old_results: &FastHashMap<HgPathCow<'a>, Dispatch>,
results: &mut Vec<DispatchedPath<'a>>,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 traversed_sender: crossbeam_channel::Sender<HgPathBuf>,
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ) {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 // The traversal is done in parallel, so use a channel to gather
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 // entries. `crossbeam_channel::Sender` is `Sync`, while `mpsc::Sender`
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 // is not.
let (files_transmitter, files_receiver) =
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 crossbeam_channel::unbounded();
Raphaël Gomès
rust-status: refactor status into a struct...
r45671
self.traverse_dir(
&files_transmitter,
path,
&old_results,
traversed_sender,
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 );
Raphaël Gomès
rust-status: refactor status into a struct...
r45671
// Disconnect the channel so the receiver stops waiting
drop(files_transmitter);
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 let new_results = files_receiver
.into_iter()
.par_bridge()
.map(|(f, d)| (Cow::Owned(f), d));
Raphaël Gomès
rust-status: refactor status into a struct...
r45671
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 results.par_extend(new_results);
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
/// Dispatch a single entry (file, folder, symlink...) found during
/// `traverse`. If the entry is a folder that needs to be traversed, it
/// will be handled in a separate thread.
fn handle_traversed_entry<'b>(
&'a self,
scope: &rayon::Scope<'b>,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 files_sender: &'b crossbeam_channel::Sender<(HgPathBuf, Dispatch)>,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 old_results: &'a FastHashMap<Cow<HgPath>, Dispatch>,
filename: HgPathBuf,
dir_entry: DirEntry,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 traversed_sender: crossbeam_channel::Sender<HgPathBuf>,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 ) -> IoResult<()>
where
'a: 'b,
{
let file_type = dir_entry.file_type()?;
let entry_option = self.dmap.get(&filename);
if filename.as_bytes() == b".hg" {
// Could be a directory or a symlink
return Ok(());
}
if file_type.is_dir() {
self.handle_traversed_dir(
scope,
files_sender,
old_results,
entry_option,
filename,
traversed_sender,
);
} else if file_type.is_file() || file_type.is_symlink() {
if let Some(entry) = entry_option {
if self.matcher.matches_everything()
|| self.matcher.matches(&filename)
{
let metadata = dir_entry.metadata()?;
files_sender
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .send((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 filename.to_owned(),
dispatch_found(
&filename,
*entry,
HgMetadata::from_metadata(metadata),
&self.dmap.copy_map,
self.options,
),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 .unwrap();
}
} else if (self.matcher.matches_everything()
|| self.matcher.matches(&filename))
&& !self.is_ignored(&filename)
{
if (self.options.list_ignored
|| self.matcher.exact_match(&filename))
&& self.dir_ignore(&filename)
{
if self.options.list_ignored {
files_sender
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .send((filename.to_owned(), Dispatch::Ignored))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 .unwrap();
}
} else if self.options.list_unknown {
files_sender
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .send((filename.to_owned(), Dispatch::Unknown))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 .unwrap();
}
} else if self.is_ignored(&filename) && self.options.list_ignored {
files_sender
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .send((filename.to_owned(), Dispatch::Ignored))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 .unwrap();
}
} else if let Some(entry) = entry_option {
// Used to be a file or a folder, now something else.
if self.matcher.matches_everything()
|| self.matcher.matches(&filename)
{
files_sender
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .send((filename.to_owned(), dispatch_missing(entry.state)))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 .unwrap();
}
}
Ok(())
}
/// A directory was found in the filesystem and needs to be traversed
fn handle_traversed_dir<'b>(
&'a self,
scope: &rayon::Scope<'b>,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 files_sender: &'b crossbeam_channel::Sender<(HgPathBuf, Dispatch)>,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 old_results: &'a FastHashMap<Cow<HgPath>, Dispatch>,
entry_option: Option<&'a DirstateEntry>,
directory: HgPathBuf,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 traversed_sender: crossbeam_channel::Sender<HgPathBuf>,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 ) where
'a: 'b,
{
scope.spawn(move |_| {
// Nested `if` until `rust-lang/rust#53668` is stable
if let Some(entry) = entry_option {
// Used to be a file, is now a folder
if self.matcher.matches_everything()
|| self.matcher.matches(&directory)
{
files_sender
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .send((
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 directory.to_owned(),
dispatch_missing(entry.state),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 .unwrap();
}
}
// Do we need to traverse it?
if !self.is_ignored(&directory) || self.options.list_ignored {
self.traverse_dir(
files_sender,
directory,
&old_results,
traversed_sender,
)
}
});
}
/// Decides whether the directory needs to be listed, and if so handles the
/// entries in a separate thread.
fn traverse_dir(
&self,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 files_sender: &crossbeam_channel::Sender<(HgPathBuf, Dispatch)>,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 directory: impl AsRef<HgPath>,
old_results: &FastHashMap<Cow<HgPath>, Dispatch>,
Simon Sapin
rust: use crossbeam-channel crate directly...
r46669 traversed_sender: crossbeam_channel::Sender<HgPathBuf>,
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ) {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 let directory = directory.as_ref();
if self.options.collect_traversed_dirs {
traversed_sender
.send(directory.to_owned())
.expect("receiver should outlive sender");
}
let visit_entries = match self.matcher.visit_children_set(directory) {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 VisitChildrenSet::Empty => return,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 VisitChildrenSet::This | VisitChildrenSet::Recursive => None,
VisitChildrenSet::Set(set) => Some(set),
};
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 let buf = match hg_path_to_path_buf(directory) {
Ok(b) => b,
Err(_) => {
files_sender
.send((directory.to_owned(), INVALID_PATH_DISPATCH))
.expect("receiver should outlive sender");
return;
}
};
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 let dir_path = self.root_dir.join(buf);
let skip_dot_hg = !directory.as_bytes().is_empty();
let entries = match list_directory(dir_path, skip_dot_hg) {
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 Err(e) => {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 files_sender
.send((directory.to_owned(), dispatch_os_error(&e)))
.expect("receiver should outlive sender");
return;
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 }
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Ok(entries) => entries,
};
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 rayon::scope(|scope| {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 for (filename, dir_entry) in entries {
if let Some(ref set) = visit_entries {
if !set.contains(filename.deref()) {
continue;
}
}
// TODO normalize
let filename = if directory.is_empty() {
filename.to_owned()
} else {
directory.join(&filename)
};
if !old_results.contains_key(filename.deref()) {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 match self.handle_traversed_entry(
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 scope,
files_sender,
old_results,
filename,
dir_entry,
traversed_sender.clone(),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ) {
Err(e) => {
files_sender
.send((
directory.to_owned(),
dispatch_os_error(&e),
))
.expect("receiver should outlive sender");
}
Ok(_) => {}
}
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
}
})
}
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 /// Add the files in the dirstate to the results.
///
/// This takes a mutable reference to the results to account for the
/// `extend` in timings
#[cfg(feature = "dirstate-tree")]
#[timed]
pub fn extend_from_dmap(&self, results: &mut Vec<DispatchedPath<'a>>) {
results.par_extend(
self.dmap
.fs_iter(self.root_dir.clone())
.par_bridge()
.filter(|(path, _)| self.matcher.matches(path))
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 .map(move |(filename, shortcut)| {
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 let entry = match shortcut {
StatusShortcut::Entry(e) => e,
StatusShortcut::Dispatch(d) => {
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 return (Cow::Owned(filename), d)
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
};
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 let filename_as_path = match hg_path_to_path_buf(&filename)
{
Ok(f) => f,
Err(_) => {
return (
Cow::Owned(filename),
INVALID_PATH_DISPATCH,
)
}
};
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 let meta = self
.root_dir
.join(filename_as_path)
.symlink_metadata();
match meta {
Raphaël Gomès
rust: leverage improved match ergonomics...
r46190 Ok(m)
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 if !(m.file_type().is_file()
|| m.file_type().is_symlink()) =>
{
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 (
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 Cow::Owned(filename),
dispatch_missing(entry.state),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 )
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
Ok(m) => {
let dispatch = dispatch_found(
&filename,
entry,
HgMetadata::from_metadata(m),
&self.dmap.copy_map,
self.options,
);
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 (Cow::Owned(filename), dispatch)
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
Raphaël Gomès
rust: leverage improved match ergonomics...
r46190 Err(e)
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 if e.kind() == ErrorKind::NotFound
|| e.raw_os_error() == Some(20) =>
{
// Rust does not yet have an `ErrorKind` for
// `NotADirectory` (errno 20)
// It happens if the dirstate contains `foo/bar`
// and foo is not a
// directory
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 (
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 Cow::Owned(filename),
dispatch_missing(entry.state),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 )
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Err(e) => {
(Cow::Owned(filename), dispatch_os_error(&e))
}
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
}),
);
}
/// Add the files in the dirstate to the results.
///
/// This takes a mutable reference to the results to account for the
/// `extend` in timings
#[cfg(not(feature = "dirstate-tree"))]
#[timed]
pub fn extend_from_dmap(&self, results: &mut Vec<DispatchedPath<'a>>) {
Raphaël Gomès
rust-status: honor matcher when using the dirstate-only fast-path (issue6483)...
r47218 results.par_extend(
self.dmap
.par_iter()
.filter(|(path, _)| self.matcher.matches(path))
.map(move |(filename, entry)| {
let filename: &HgPath = filename;
let filename_as_path = match hg_path_to_path_buf(filename)
{
Ok(f) => f,
Err(_) => {
return (
Cow::Borrowed(filename),
INVALID_PATH_DISPATCH,
)
}
};
let meta = self
.root_dir
.join(filename_as_path)
.symlink_metadata();
match meta {
Ok(m)
if !(m.file_type().is_file()
|| m.file_type().is_symlink()) =>
{
(
Cow::Borrowed(filename),
dispatch_missing(entry.state),
)
}
Ok(m) => (
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Cow::Borrowed(filename),
Raphaël Gomès
rust-status: honor matcher when using the dirstate-only fast-path (issue6483)...
r47218 dispatch_found(
filename,
*entry,
HgMetadata::from_metadata(m),
&self.dmap.copy_map,
self.options,
),
),
Err(e)
if e.kind() == ErrorKind::NotFound
|| e.raw_os_error() == Some(20) =>
{
// Rust does not yet have an `ErrorKind` for
// `NotADirectory` (errno 20)
// It happens if the dirstate contains `foo/bar`
// and foo is not a
// directory
(
Cow::Borrowed(filename),
dispatch_missing(entry.state),
)
}
Err(e) => {
(Cow::Borrowed(filename), dispatch_os_error(&e))
}
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
Raphaël Gomès
rust-status: honor matcher when using the dirstate-only fast-path (issue6483)...
r47218 }),
);
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 }
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 /// Checks all files that are in the dirstate but were not found during the
/// working directory traversal. This means that the rest must
/// be either ignored, under a symlink or under a new nested repo.
///
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 /// This takes a mutable reference to the results to account for the
/// `extend` in timings
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 #[cfg(not(feature = "dirstate-tree"))]
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 #[timed]
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 pub fn handle_unknowns(&self, results: &mut Vec<DispatchedPath<'a>>) {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 let to_visit: Vec<(&HgPath, &DirstateEntry)> =
if results.is_empty() && self.matcher.matches_everything() {
self.dmap.iter().map(|(f, e)| (f.deref(), e)).collect()
} else {
// Only convert to a hashmap if needed.
let old_results: FastHashMap<_, _> =
results.iter().cloned().collect();
self.dmap
.iter()
.filter_map(move |(f, e)| {
if !old_results.contains_key(f.deref())
&& self.matcher.matches(f)
{
Some((f.deref(), e))
} else {
None
}
})
.collect()
};
let path_auditor = PathAuditor::new(&self.root_dir);
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 let new_results = to_visit.into_par_iter().filter_map(
|(filename, entry)| -> Option<_> {
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 // Report ignored items in the dmap as long as they are not
// under a symlink directory.
if path_auditor.check(filename) {
// TODO normalize for case-insensitive filesystems
let buf = match hg_path_to_path_buf(filename) {
Ok(x) => x,
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Err(_) => {
return Some((
Cow::Owned(filename.to_owned()),
INVALID_PATH_DISPATCH,
));
}
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 };
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Some((
Cow::Owned(filename.to_owned()),
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 match self.root_dir.join(&buf).symlink_metadata() {
// File was just ignored, no links, and exists
Ok(meta) => {
let metadata = HgMetadata::from_metadata(meta);
dispatch_found(
filename,
*entry,
metadata,
&self.dmap.copy_map,
self.options,
)
}
// File doesn't exist
Err(_) => dispatch_missing(entry.state),
},
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 } else {
// It's either missing or under a symlink directory which
// we, in this case, report as missing.
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 Some((
Cow::Owned(filename.to_owned()),
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 dispatch_missing(entry.state),
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 ))
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 },
);
Raphaël Gomès
rust-status: refactor status into a struct...
r45671
Raphaël Gomès
rust-status: don't bubble up os errors, translate them to bad matches...
r46466 results.par_extend(new_results);
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 }
}
Raphaël Gomès
hg-core: add function timing information...
r45028 #[timed]
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 pub fn build_response<'a>(
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 results: impl IntoIterator<Item = DispatchedPath<'a>>,
Raphaël Gomès
rust-status: collect traversed directories if required...
r45353 traversed: Vec<HgPathBuf>,
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 ) -> (Vec<HgPathCow<'a>>, DirstateStatus<'a>) {
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 let mut lookup = vec![];
let mut modified = vec![];
let mut added = vec![];
let mut removed = vec![];
let mut deleted = vec![];
let mut clean = vec![];
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 let mut ignored = vec![];
let mut unknown = vec![];
let mut bad = vec![];
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 for (filename, dispatch) in results.into_iter() {
Raphaël Gomès
rust-status: improve status performance...
r44000 match dispatch {
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 Dispatch::Unknown => unknown.push(filename),
Raphaël Gomès
rust-status: improve status performance...
r44000 Dispatch::Unsure => lookup.push(filename),
Dispatch::Modified => modified.push(filename),
Dispatch::Added => added.push(filename),
Dispatch::Removed => removed.push(filename),
Dispatch::Deleted => deleted.push(filename),
Dispatch::Clean => clean.push(filename),
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 Dispatch::Ignored => ignored.push(filename),
Dispatch::None => {}
Dispatch::Bad(reason) => bad.push((filename, reason)),
Dispatch::Directory { .. } => {}
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 }
}
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 (
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 lookup,
Raphaël Gomès
rust-status: rename `StatusResult` to `DirstateStatus`...
r45012 DirstateStatus {
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 modified,
added,
removed,
deleted,
clean,
Raphaël Gomès
rust-status: add missing variants to `Dispatch` enum...
r45013 ignored,
unknown,
bad,
Raphaël Gomès
rust-status: collect traversed directories if required...
r45353 traversed,
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 },
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 )
}
/// Get the status of files in the working directory.
///
/// This is the current entry-point for `hg-core` and is realistically unusable
/// outside of a Python context because its arguments need to provide a lot of
/// information that will not be necessary in the future.
Raphaël Gomès
hg-core: add function timing information...
r45028 #[timed]
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 pub fn status<'a>(
Raphaël Gomès
rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait...
r44367 dmap: &'a DirstateMap,
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 matcher: &'a (impl Matcher + Sync),
root_dir: PathBuf,
Raphaël Gomès
rust-status: only involve ignore mechanism when needed...
r45088 ignore_files: Vec<PathBuf>,
Raphaël Gomès
rust-status: refactor options into a `StatusOptions` struct...
r45011 options: StatusOptions,
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 ) -> StatusResult<(
Raphaël Gomès
rust-status: improve documentation and readability...
r45672 (Vec<HgPathCow<'a>>, DirstateStatus<'a>),
Raphaël Gomès
rust-status: add bare `hg status` support in hg-core...
r45015 Vec<PatternFileWarning>,
)> {
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 let (status, warnings) =
Raphaël Gomès
rust-status: refactor status into a struct...
r45671 Status::new(dmap, matcher, root_dir, ignore_files, options)?;
Raphaël Gomès
rust-status: collect traversed directories if required...
r45353
Raphaël Gomès
hg-core: define a `dirstate_status` `Operation`...
r45673 Ok((status.run()?, warnings))
Raphaël Gomès
rust-dirstate-status: add first Rust implementation of `dirstate.status`...
r43565 }