status.rs
466 lines
| 16.7 KiB
| application/rls-services+xml
|
RustLexer
Simon Sapin
|
r47883 | use crate::dirstate::status::IgnoreFnType; | ||
Simon Sapin
|
r48124 | use crate::dirstate_tree::dirstate_map::ChildNodesRef; | ||
Simon Sapin
|
r47882 | use crate::dirstate_tree::dirstate_map::DirstateMap; | ||
Simon Sapin
|
r48124 | use crate::dirstate_tree::dirstate_map::NodeRef; | ||
Simon Sapin
|
r48126 | use crate::dirstate_tree::on_disk::DirstateV2ParseError; | ||
Simon Sapin
|
r47883 | use crate::matchers::get_ignore_function; | ||
Simon Sapin
|
r47882 | use crate::matchers::Matcher; | ||
Simon Sapin
|
r47883 | use crate::utils::files::get_bytes_from_os_string; | ||
Simon Sapin
|
r48129 | use crate::utils::files::get_path_from_bytes; | ||
Simon Sapin
|
r47883 | use crate::utils::hg_path::HgPath; | ||
Simon Sapin
|
r47885 | use crate::BadMatch; | ||
Simon Sapin
|
r47882 | use crate::DirstateStatus; | ||
Simon Sapin
|
r47883 | use crate::EntryState; | ||
use crate::HgPathBuf; | ||||
Simon Sapin
|
r47882 | use crate::PatternFileWarning; | ||
use crate::StatusError; | ||||
use crate::StatusOptions; | ||||
Simon Sapin
|
r47888 | use micro_timer::timed; | ||
Simon Sapin
|
r47887 | use rayon::prelude::*; | ||
Simon Sapin
|
r47883 | use std::borrow::Cow; | ||
use std::io; | ||||
use std::path::Path; | ||||
Simon Sapin
|
r47882 | use std::path::PathBuf; | ||
Simon Sapin
|
r47887 | use std::sync::Mutex; | ||
Simon Sapin
|
r47882 | |||
Simon Sapin
|
r47883 | /// Returns the status of the working directory compared to its parent | ||
/// changeset. | ||||
/// | ||||
/// This algorithm is based on traversing the filesystem tree (`fs` in function | ||||
/// and variable names) and dirstate tree at the same time. The core of this | ||||
/// traversal is the recursive `traverse_fs_directory_and_dirstate` function | ||||
/// and its use of `itertools::merge_join_by`. When reaching a path that only | ||||
/// exists in one of the two trees, depending on information requested by | ||||
/// `options` we may need to traverse the remaining subtree. | ||||
Simon Sapin
|
r47888 | #[timed] | ||
Simon Sapin
|
r48127 | pub fn status<'tree, 'on_disk: 'tree>( | ||
dmap: &'tree mut DirstateMap<'on_disk>, | ||||
Simon Sapin
|
r47883 | matcher: &(dyn Matcher + Sync), | ||
root_dir: PathBuf, | ||||
ignore_files: Vec<PathBuf>, | ||||
options: StatusOptions, | ||||
) -> Result<(DirstateStatus<'tree>, Vec<PatternFileWarning>), StatusError> { | ||||
let (ignore_fn, warnings): (IgnoreFnType, _) = | ||||
if options.list_ignored || options.list_unknown { | ||||
get_ignore_function(ignore_files, &root_dir)? | ||||
} else { | ||||
(Box::new(|&_| true), vec![]) | ||||
}; | ||||
Simon Sapin
|
r47887 | let common = StatusCommon { | ||
Simon Sapin
|
r48127 | dmap, | ||
Simon Sapin
|
r47883 | options, | ||
matcher, | ||||
ignore_fn, | ||||
Simon Sapin
|
r47887 | outcome: Mutex::new(DirstateStatus::default()), | ||
Simon Sapin
|
r47883 | }; | ||
let is_at_repo_root = true; | ||||
let hg_path = HgPath::new(""); | ||||
let has_ignored_ancestor = false; | ||||
common.traverse_fs_directory_and_dirstate( | ||||
has_ignored_ancestor, | ||||
Simon Sapin
|
r48124 | dmap.root.as_ref(), | ||
Simon Sapin
|
r47883 | hg_path, | ||
&root_dir, | ||||
is_at_repo_root, | ||||
Simon Sapin
|
r48126 | )?; | ||
Simon Sapin
|
r47887 | Ok((common.outcome.into_inner().unwrap(), warnings)) | ||
Simon Sapin
|
r47883 | } | ||
/// Bag of random things needed by various parts of the algorithm. Reduces the | ||||
/// number of parameters passed to functions. | ||||
Simon Sapin
|
r48127 | struct StatusCommon<'tree, 'a, 'on_disk: 'tree> { | ||
dmap: &'tree DirstateMap<'on_disk>, | ||||
Simon Sapin
|
r47883 | options: StatusOptions, | ||
matcher: &'a (dyn Matcher + Sync), | ||||
ignore_fn: IgnoreFnType<'a>, | ||||
Simon Sapin
|
r47887 | outcome: Mutex<DirstateStatus<'tree>>, | ||
Simon Sapin
|
r47882 | } | ||
Simon Sapin
|
r47883 | |||
Simon Sapin
|
r48127 | impl<'tree, 'a> StatusCommon<'tree, 'a, '_> { | ||
Simon Sapin
|
r47885 | fn read_dir( | ||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r47885 | hg_path: &HgPath, | ||
fs_path: &Path, | ||||
is_at_repo_root: bool, | ||||
) -> Result<Vec<DirEntry>, ()> { | ||||
Simon Sapin
|
r48129 | DirEntry::read_dir(fs_path, is_at_repo_root) | ||
.map_err(|error| self.io_error(error, hg_path)) | ||||
} | ||||
fn io_error(&self, error: std::io::Error, hg_path: &HgPath) { | ||||
let errno = error.raw_os_error().expect("expected real OS error"); | ||||
self.outcome | ||||
.lock() | ||||
.unwrap() | ||||
.bad | ||||
.push((hg_path.to_owned().into(), BadMatch::OsError(errno))) | ||||
Simon Sapin
|
r47885 | } | ||
Simon Sapin
|
r47883 | fn traverse_fs_directory_and_dirstate( | ||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r47883 | has_ignored_ancestor: bool, | ||
Simon Sapin
|
r48124 | dirstate_nodes: ChildNodesRef<'tree, '_>, | ||
Simon Sapin
|
r47885 | directory_hg_path: &'tree HgPath, | ||
directory_fs_path: &Path, | ||||
Simon Sapin
|
r47883 | is_at_repo_root: bool, | ||
Simon Sapin
|
r48126 | ) -> Result<(), DirstateV2ParseError> { | ||
Simon Sapin
|
r48129 | if !self.options.list_unknown && !self.options.list_ignored { | ||
// We only care about files in the dirstate, so we can skip listing | ||||
// filesystem directories entirely. | ||||
return dirstate_nodes | ||||
.par_iter() | ||||
.map(|dirstate_node| { | ||||
let fs_path = directory_fs_path.join(get_path_from_bytes( | ||||
dirstate_node.base_name(self.dmap.on_disk)?.as_bytes(), | ||||
)); | ||||
match std::fs::symlink_metadata(&fs_path) { | ||||
Ok(fs_metadata) => self.traverse_fs_and_dirstate( | ||||
&fs_path, | ||||
&fs_metadata, | ||||
dirstate_node, | ||||
has_ignored_ancestor, | ||||
), | ||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => { | ||||
self.traverse_dirstate_only(dirstate_node) | ||||
} | ||||
Err(error) => { | ||||
let hg_path = | ||||
dirstate_node.full_path(self.dmap.on_disk)?; | ||||
Ok(self.io_error(error, hg_path)) | ||||
} | ||||
} | ||||
}) | ||||
.collect(); | ||||
} | ||||
Simon Sapin
|
r47885 | let mut fs_entries = if let Ok(entries) = self.read_dir( | ||
directory_hg_path, | ||||
directory_fs_path, | ||||
is_at_repo_root, | ||||
) { | ||||
entries | ||||
} else { | ||||
Simon Sapin
|
r48126 | return Ok(()); | ||
Simon Sapin
|
r47885 | }; | ||
Simon Sapin
|
r47883 | |||
// `merge_join_by` requires both its input iterators to be sorted: | ||||
Simon Sapin
|
r48124 | let dirstate_nodes = dirstate_nodes.sorted(); | ||
Simon Sapin
|
r47883 | // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: | ||
// https://github.com/rust-lang/rust/issues/34162 | ||||
fs_entries.sort_unstable_by(|e1, e2| e1.base_name.cmp(&e2.base_name)); | ||||
Simon Sapin
|
r48126 | // Propagate here any error that would happen inside the comparison | ||
// callback below | ||||
for dirstate_node in &dirstate_nodes { | ||||
Simon Sapin
|
r48127 | dirstate_node.base_name(self.dmap.on_disk)?; | ||
Simon Sapin
|
r48126 | } | ||
Simon Sapin
|
r47887 | itertools::merge_join_by( | ||
Simon Sapin
|
r47883 | dirstate_nodes, | ||
&fs_entries, | ||||
Simon Sapin
|
r48124 | |dirstate_node, fs_entry| { | ||
Simon Sapin
|
r48126 | // This `unwrap` never panics because we already propagated | ||
// those errors above | ||||
Simon Sapin
|
r48127 | dirstate_node | ||
.base_name(self.dmap.on_disk) | ||||
.unwrap() | ||||
.cmp(&fs_entry.base_name) | ||||
Simon Sapin
|
r47883 | }, | ||
Simon Sapin
|
r47887 | ) | ||
.par_bridge() | ||||
Simon Sapin
|
r48126 | .map(|pair| { | ||
Simon Sapin
|
r47883 | use itertools::EitherOrBoth::*; | ||
match pair { | ||||
Simon Sapin
|
r48126 | Both(dirstate_node, fs_entry) => self | ||
.traverse_fs_and_dirstate( | ||||
Simon Sapin
|
r48129 | &fs_entry.full_path, | ||
&fs_entry.metadata, | ||||
Simon Sapin
|
r47883 | dirstate_node, | ||
has_ignored_ancestor, | ||||
Simon Sapin
|
r48126 | ), | ||
Simon Sapin
|
r48124 | Left(dirstate_node) => { | ||
self.traverse_dirstate_only(dirstate_node) | ||||
} | ||||
Simon Sapin
|
r48126 | Right(fs_entry) => Ok(self.traverse_fs_only( | ||
Simon Sapin
|
r47883 | has_ignored_ancestor, | ||
directory_hg_path, | ||||
fs_entry, | ||||
Simon Sapin
|
r48126 | )), | ||
Simon Sapin
|
r47883 | } | ||
Simon Sapin
|
r47887 | }) | ||
Simon Sapin
|
r48126 | .collect() | ||
Simon Sapin
|
r47883 | } | ||
fn traverse_fs_and_dirstate( | ||||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r48129 | fs_path: &Path, | ||
fs_metadata: &std::fs::Metadata, | ||||
Simon Sapin
|
r48124 | dirstate_node: NodeRef<'tree, '_>, | ||
Simon Sapin
|
r47883 | has_ignored_ancestor: bool, | ||
Simon Sapin
|
r48126 | ) -> Result<(), DirstateV2ParseError> { | ||
Simon Sapin
|
r48127 | let hg_path = dirstate_node.full_path(self.dmap.on_disk)?; | ||
Simon Sapin
|
r48129 | let file_type = fs_metadata.file_type(); | ||
Simon Sapin
|
r47884 | let file_or_symlink = file_type.is_file() || file_type.is_symlink(); | ||
if !file_or_symlink { | ||||
Simon Sapin
|
r47883 | // If we previously had a file here, it was removed (with | ||
// `hg rm` or similar) or deleted before it could be | ||||
Simon Sapin
|
r47884 | // replaced by a directory or something else. | ||
Simon Sapin
|
r47883 | self.mark_removed_or_deleted_if_file( | ||
Simon Sapin
|
r48126 | hg_path, | ||
dirstate_node.state()?, | ||||
Simon Sapin
|
r47883 | ); | ||
Simon Sapin
|
r47884 | } | ||
if file_type.is_dir() { | ||||
if self.options.collect_traversed_dirs { | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().traversed.push(hg_path.into()) | ||
Simon Sapin
|
r47884 | } | ||
Simon Sapin
|
r47883 | let is_ignored = has_ignored_ancestor || (self.ignore_fn)(hg_path); | ||
let is_at_repo_root = false; | ||||
self.traverse_fs_directory_and_dirstate( | ||||
is_ignored, | ||||
Simon Sapin
|
r48127 | dirstate_node.children(self.dmap.on_disk)?, | ||
Simon Sapin
|
r47883 | hg_path, | ||
Simon Sapin
|
r48129 | fs_path, | ||
Simon Sapin
|
r47883 | is_at_repo_root, | ||
Simon Sapin
|
r48126 | )? | ||
Simon Sapin
|
r47883 | } else { | ||
Simon Sapin
|
r47884 | if file_or_symlink && self.matcher.matches(hg_path) { | ||
Simon Sapin
|
r47883 | let full_path = Cow::from(hg_path); | ||
Simon Sapin
|
r48126 | if let Some(state) = dirstate_node.state()? { | ||
Simon Sapin
|
r48124 | match state { | ||
Simon Sapin
|
r47883 | EntryState::Added => { | ||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().added.push(full_path) | ||
Simon Sapin
|
r47883 | } | ||
Simon Sapin
|
r47887 | EntryState::Removed => self | ||
.outcome | ||||
.lock() | ||||
.unwrap() | ||||
.removed | ||||
.push(full_path), | ||||
EntryState::Merged => self | ||||
.outcome | ||||
.lock() | ||||
.unwrap() | ||||
.modified | ||||
.push(full_path), | ||||
Simon Sapin
|
r48129 | EntryState::Normal => self | ||
.handle_normal_file(&dirstate_node, fs_metadata)?, | ||||
Simon Sapin
|
r47883 | // This variant is not used in DirstateMap | ||
// nodes | ||||
EntryState::Unknown => unreachable!(), | ||||
} | ||||
} else { | ||||
// `node.entry.is_none()` indicates a "directory" | ||||
// node, but the filesystem has a file | ||||
self.mark_unknown_or_ignored( | ||||
has_ignored_ancestor, | ||||
full_path, | ||||
) | ||||
} | ||||
} | ||||
Simon Sapin
|
r48127 | for child_node in dirstate_node.children(self.dmap.on_disk)?.iter() | ||
{ | ||||
Simon Sapin
|
r48126 | self.traverse_dirstate_only(child_node)? | ||
Simon Sapin
|
r47883 | } | ||
} | ||||
Simon Sapin
|
r48126 | Ok(()) | ||
Simon Sapin
|
r47883 | } | ||
/// A file with `EntryState::Normal` in the dirstate was found in the | ||||
/// filesystem | ||||
fn handle_normal_file( | ||||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r48124 | dirstate_node: &NodeRef<'tree, '_>, | ||
Simon Sapin
|
r48129 | fs_metadata: &std::fs::Metadata, | ||
Simon Sapin
|
r48126 | ) -> Result<(), DirstateV2ParseError> { | ||
Simon Sapin
|
r47883 | // Keep the low 31 bits | ||
fn truncate_u64(value: u64) -> i32 { | ||||
(value & 0x7FFF_FFFF) as i32 | ||||
} | ||||
fn truncate_i64(value: i64) -> i32 { | ||||
(value & 0x7FFF_FFFF) as i32 | ||||
} | ||||
Simon Sapin
|
r48124 | let entry = dirstate_node | ||
Simon Sapin
|
r48126 | .entry()? | ||
Simon Sapin
|
r48124 | .expect("handle_normal_file called with entry-less node"); | ||
Simon Sapin
|
r48127 | let full_path = Cow::from(dirstate_node.full_path(self.dmap.on_disk)?); | ||
Simon Sapin
|
r48129 | let mode_changed = | ||
|| self.options.check_exec && entry.mode_changed(fs_metadata); | ||||
let size_changed = entry.size != truncate_u64(fs_metadata.len()); | ||||
Simon Sapin
|
r47883 | if entry.size >= 0 | ||
&& size_changed | ||||
Simon Sapin
|
r48129 | && fs_metadata.file_type().is_symlink() | ||
Simon Sapin
|
r47883 | { | ||
// issue6456: Size returned may be longer due to encryption | ||||
// on EXT-4 fscrypt. TODO maybe only do it on EXT4? | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().unsure.push(full_path) | ||
Simon Sapin
|
r48126 | } else if dirstate_node.has_copy_source() | ||
Simon Sapin
|
r47883 | || entry.is_from_other_parent() | ||
|| (entry.size >= 0 && (size_changed || mode_changed())) | ||||
{ | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().modified.push(full_path) | ||
Simon Sapin
|
r47883 | } else { | ||
Simon Sapin
|
r48129 | let mtime = mtime_seconds(fs_metadata); | ||
Simon Sapin
|
r47883 | if truncate_i64(mtime) != entry.mtime | ||
|| mtime == self.options.last_normal_time | ||||
{ | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().unsure.push(full_path) | ||
Simon Sapin
|
r47883 | } else if self.options.list_clean { | ||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().clean.push(full_path) | ||
Simon Sapin
|
r47883 | } | ||
} | ||||
Simon Sapin
|
r48126 | Ok(()) | ||
Simon Sapin
|
r47883 | } | ||
/// A node in the dirstate tree has no corresponding filesystem entry | ||||
Simon Sapin
|
r48126 | fn traverse_dirstate_only( | ||
&self, | ||||
dirstate_node: NodeRef<'tree, '_>, | ||||
) -> Result<(), DirstateV2ParseError> { | ||||
Simon Sapin
|
r48124 | self.mark_removed_or_deleted_if_file( | ||
Simon Sapin
|
r48127 | dirstate_node.full_path(self.dmap.on_disk)?, | ||
Simon Sapin
|
r48126 | dirstate_node.state()?, | ||
Simon Sapin
|
r48124 | ); | ||
dirstate_node | ||||
Simon Sapin
|
r48127 | .children(self.dmap.on_disk)? | ||
Simon Sapin
|
r48124 | .par_iter() | ||
Simon Sapin
|
r48126 | .map(|child_node| self.traverse_dirstate_only(child_node)) | ||
.collect() | ||||
Simon Sapin
|
r47883 | } | ||
/// A node in the dirstate tree has no corresponding *file* on the | ||||
/// filesystem | ||||
/// | ||||
/// Does nothing on a "directory" node | ||||
fn mark_removed_or_deleted_if_file( | ||||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r47883 | hg_path: &'tree HgPath, | ||
dirstate_node_state: Option<EntryState>, | ||||
) { | ||||
if let Some(state) = dirstate_node_state { | ||||
if self.matcher.matches(hg_path) { | ||||
if let EntryState::Removed = state { | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().removed.push(hg_path.into()) | ||
Simon Sapin
|
r47883 | } else { | ||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().deleted.push(hg_path.into()) | ||
Simon Sapin
|
r47883 | } | ||
} | ||||
} | ||||
} | ||||
/// Something in the filesystem has no corresponding dirstate node | ||||
fn traverse_fs_only( | ||||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r47883 | has_ignored_ancestor: bool, | ||
directory_hg_path: &HgPath, | ||||
fs_entry: &DirEntry, | ||||
) { | ||||
let hg_path = directory_hg_path.join(&fs_entry.base_name); | ||||
Simon Sapin
|
r47884 | let file_type = fs_entry.metadata.file_type(); | ||
let file_or_symlink = file_type.is_file() || file_type.is_symlink(); | ||||
if file_type.is_dir() { | ||||
Simon Sapin
|
r47883 | let is_ignored = | ||
has_ignored_ancestor || (self.ignore_fn)(&hg_path); | ||||
let traverse_children = if is_ignored { | ||||
// Descendants of an ignored directory are all ignored | ||||
self.options.list_ignored | ||||
} else { | ||||
// Descendants of an unknown directory may be either unknown or | ||||
// ignored | ||||
self.options.list_unknown || self.options.list_ignored | ||||
}; | ||||
if traverse_children { | ||||
let is_at_repo_root = false; | ||||
Simon Sapin
|
r47885 | if let Ok(children_fs_entries) = self.read_dir( | ||
&hg_path, | ||||
&fs_entry.full_path, | ||||
is_at_repo_root, | ||||
) { | ||||
Simon Sapin
|
r47887 | children_fs_entries.par_iter().for_each(|child_fs_entry| { | ||
Simon Sapin
|
r47885 | self.traverse_fs_only( | ||
is_ignored, | ||||
&hg_path, | ||||
Simon Sapin
|
r47887 | child_fs_entry, | ||
Simon Sapin
|
r47885 | ) | ||
Simon Sapin
|
r47887 | }) | ||
Simon Sapin
|
r47883 | } | ||
} | ||||
if self.options.collect_traversed_dirs { | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().traversed.push(hg_path.into()) | ||
Simon Sapin
|
r47883 | } | ||
Simon Sapin
|
r47884 | } else if file_or_symlink && self.matcher.matches(&hg_path) { | ||
Simon Sapin
|
r47883 | self.mark_unknown_or_ignored(has_ignored_ancestor, hg_path.into()) | ||
} | ||||
} | ||||
fn mark_unknown_or_ignored( | ||||
Simon Sapin
|
r47887 | &self, | ||
Simon Sapin
|
r47883 | has_ignored_ancestor: bool, | ||
hg_path: Cow<'tree, HgPath>, | ||||
) { | ||||
let is_ignored = has_ignored_ancestor || (self.ignore_fn)(&hg_path); | ||||
if is_ignored { | ||||
if self.options.list_ignored { | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().ignored.push(hg_path) | ||
Simon Sapin
|
r47883 | } | ||
} else { | ||||
if self.options.list_unknown { | ||||
Simon Sapin
|
r47887 | self.outcome.lock().unwrap().unknown.push(hg_path) | ||
Simon Sapin
|
r47883 | } | ||
} | ||||
} | ||||
} | ||||
#[cfg(unix)] // TODO | ||||
fn mtime_seconds(metadata: &std::fs::Metadata) -> i64 { | ||||
// Going through `Metadata::modified()` would be portable, but would take | ||||
// care to construct a `SystemTime` value with sub-second precision just | ||||
// for us to throw that away here. | ||||
use std::os::unix::fs::MetadataExt; | ||||
metadata.mtime() | ||||
} | ||||
struct DirEntry { | ||||
base_name: HgPathBuf, | ||||
full_path: PathBuf, | ||||
metadata: std::fs::Metadata, | ||||
} | ||||
impl DirEntry { | ||||
/// Returns **unsorted** entries in the given directory, with name and | ||||
/// metadata. | ||||
/// | ||||
/// If a `.hg` sub-directory is encountered: | ||||
/// | ||||
/// * At the repository root, ignore that sub-directory | ||||
/// * Elsewhere, we’re listing the content of a sub-repo. Return an empty | ||||
/// list instead. | ||||
fn read_dir(path: &Path, is_at_repo_root: bool) -> io::Result<Vec<Self>> { | ||||
let mut results = Vec::new(); | ||||
for entry in path.read_dir()? { | ||||
let entry = entry?; | ||||
let metadata = entry.metadata()?; | ||||
let name = get_bytes_from_os_string(entry.file_name()); | ||||
// FIXME don't do this when cached | ||||
if name == b".hg" { | ||||
if is_at_repo_root { | ||||
// Skip the repo’s own .hg (might be a symlink) | ||||
continue; | ||||
} else if metadata.is_dir() { | ||||
// A .hg sub-directory at another location means a subrepo, | ||||
// skip it entirely. | ||||
return Ok(Vec::new()); | ||||
} | ||||
} | ||||
results.push(DirEntry { | ||||
base_name: name.into(), | ||||
full_path: entry.path(), | ||||
metadata, | ||||
}) | ||||
} | ||||
Ok(results) | ||||
} | ||||
} | ||||