status.rs
753 lines
| 29.2 KiB
| application/rls-services+xml
|
RustLexer
|
r47883 | use crate::dirstate::status::IgnoreFnType; | ||
|
r48136 | use crate::dirstate_tree::dirstate_map::BorrowedPath; | ||
|
r48124 | use crate::dirstate_tree::dirstate_map::ChildNodesRef; | ||
|
r47882 | use crate::dirstate_tree::dirstate_map::DirstateMap; | ||
|
r48138 | use crate::dirstate_tree::dirstate_map::NodeData; | ||
|
r48124 | use crate::dirstate_tree::dirstate_map::NodeRef; | ||
|
r48126 | use crate::dirstate_tree::on_disk::DirstateV2ParseError; | ||
|
r48138 | use crate::dirstate_tree::on_disk::Timestamp; | ||
|
r47883 | use crate::matchers::get_ignore_function; | ||
|
r47882 | use crate::matchers::Matcher; | ||
|
r47883 | use crate::utils::files::get_bytes_from_os_string; | ||
|
r48129 | use crate::utils::files::get_path_from_bytes; | ||
|
r47883 | use crate::utils::hg_path::HgPath; | ||
|
r47885 | use crate::BadMatch; | ||
|
r47882 | use crate::DirstateStatus; | ||
|
r47883 | use crate::EntryState; | ||
use crate::HgPathBuf; | ||||
|
r47882 | use crate::PatternFileWarning; | ||
use crate::StatusError; | ||||
use crate::StatusOptions; | ||||
|
r47888 | use micro_timer::timed; | ||
|
r47887 | use rayon::prelude::*; | ||
|
r48202 | use sha1::{Digest, Sha1}; | ||
|
r48138 | use std::borrow::Cow; | ||
|
r47883 | use std::io; | ||
use std::path::Path; | ||||
|
r47882 | use std::path::PathBuf; | ||
|
r47887 | use std::sync::Mutex; | ||
|
r48138 | use std::time::SystemTime; | ||
|
r47882 | |||
|
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. | ||||
|
r47888 | #[timed] | ||
|
r48127 | pub fn status<'tree, 'on_disk: 'tree>( | ||
dmap: &'tree mut DirstateMap<'on_disk>, | ||||
|
r47883 | matcher: &(dyn Matcher + Sync), | ||
root_dir: PathBuf, | ||||
ignore_files: Vec<PathBuf>, | ||||
options: StatusOptions, | ||||
|
r48136 | ) -> Result<(DirstateStatus<'on_disk>, Vec<PatternFileWarning>), StatusError> { | ||
|
r48202 | let (ignore_fn, warnings, patterns_changed): (IgnoreFnType, _, _) = | ||
|
r47883 | if options.list_ignored || options.list_unknown { | ||
|
r48202 | let mut hasher = Sha1::new(); | ||
let (ignore_fn, warnings) = get_ignore_function( | ||||
ignore_files, | ||||
&root_dir, | ||||
&mut |pattern_bytes| hasher.update(pattern_bytes), | ||||
)?; | ||||
let new_hash = *hasher.finalize().as_ref(); | ||||
let changed = new_hash != dmap.ignore_patterns_hash; | ||||
dmap.ignore_patterns_hash = new_hash; | ||||
(ignore_fn, warnings, Some(changed)) | ||||
|
r47883 | } else { | ||
|
r48202 | (Box::new(|&_| true), vec![], None) | ||
|
r47883 | }; | ||
|
r47887 | let common = StatusCommon { | ||
|
r48127 | dmap, | ||
|
r47883 | options, | ||
matcher, | ||||
ignore_fn, | ||||
|
r48138 | outcome: Default::default(), | ||
|
r48202 | ignore_patterns_have_changed: patterns_changed, | ||
new_cachable_directories: Default::default(), | ||||
|
r48268 | outated_cached_directories: Default::default(), | ||
|
r48138 | filesystem_time_at_status_start: filesystem_now(&root_dir).ok(), | ||
|
r47883 | }; | ||
let is_at_repo_root = true; | ||||
|
r48136 | let hg_path = &BorrowedPath::OnDisk(HgPath::new("")); | ||
|
r47883 | let has_ignored_ancestor = false; | ||
|
r48138 | let root_cached_mtime = None; | ||
let root_dir_metadata = None; | ||||
// If the path we have for the repository root is a symlink, do follow it. | ||||
// (As opposed to symlinks within the working directory which are not | ||||
// followed, using `std::fs::symlink_metadata`.) | ||||
|
r47883 | common.traverse_fs_directory_and_dirstate( | ||
has_ignored_ancestor, | ||||
|
r48124 | dmap.root.as_ref(), | ||
|
r47883 | hg_path, | ||
&root_dir, | ||||
|
r48138 | root_dir_metadata, | ||
root_cached_mtime, | ||||
|
r47883 | is_at_repo_root, | ||
|
r48126 | )?; | ||
|
r48139 | let mut outcome = common.outcome.into_inner().unwrap(); | ||
|
r48202 | let new_cachable = common.new_cachable_directories.into_inner().unwrap(); | ||
|
r48268 | let outdated = common.outated_cached_directories.into_inner().unwrap(); | ||
|
r48202 | |||
outcome.dirty = common.ignore_patterns_have_changed == Some(true) | ||||
|
r48268 | || !outdated.is_empty() | ||
|
r48202 | || !new_cachable.is_empty(); | ||
|
r48268 | // Remove outdated mtimes before adding new mtimes, in case a given | ||
// directory is both | ||||
for path in &outdated { | ||||
let node = dmap.get_or_insert(path)?; | ||||
if let NodeData::CachedDirectory { .. } = &node.data { | ||||
node.data = NodeData::None | ||||
} | ||||
} | ||||
|
r48202 | for (path, mtime) in &new_cachable { | ||
|
r48268 | let node = dmap.get_or_insert(path)?; | ||
|
r48138 | match &node.data { | ||
NodeData::Entry(_) => {} // Don’t overwrite an entry | ||||
NodeData::CachedDirectory { .. } | NodeData::None => { | ||||
node.data = NodeData::CachedDirectory { mtime: *mtime } | ||||
} | ||||
} | ||||
} | ||||
|
r48202 | |||
|
r48138 | Ok((outcome, warnings)) | ||
|
r47883 | } | ||
/// Bag of random things needed by various parts of the algorithm. Reduces the | ||||
/// number of parameters passed to functions. | ||||
|
r48136 | struct StatusCommon<'a, 'tree, 'on_disk: 'tree> { | ||
|
r48127 | dmap: &'tree DirstateMap<'on_disk>, | ||
|
r47883 | options: StatusOptions, | ||
matcher: &'a (dyn Matcher + Sync), | ||||
ignore_fn: IgnoreFnType<'a>, | ||||
|
r48136 | outcome: Mutex<DirstateStatus<'on_disk>>, | ||
|
r48202 | new_cachable_directories: Mutex<Vec<(Cow<'on_disk, HgPath>, Timestamp)>>, | ||
|
r48268 | outated_cached_directories: Mutex<Vec<Cow<'on_disk, HgPath>>>, | ||
|
r48202 | |||
/// Whether ignore files like `.hgignore` have changed since the previous | ||||
/// time a `status()` call wrote their hash to the dirstate. `None` means | ||||
/// we don’t know as this run doesn’t list either ignored or uknown files | ||||
/// and therefore isn’t reading `.hgignore`. | ||||
ignore_patterns_have_changed: Option<bool>, | ||||
|
r48138 | |||
/// The current time at the start of the `status()` algorithm, as measured | ||||
/// and possibly truncated by the filesystem. | ||||
filesystem_time_at_status_start: Option<SystemTime>, | ||||
|
r47882 | } | ||
|
r47883 | |||
|
r48136 | impl<'a, 'tree, 'on_disk> StatusCommon<'a, 'tree, 'on_disk> { | ||
|
r47885 | fn read_dir( | ||
|
r47887 | &self, | ||
|
r47885 | hg_path: &HgPath, | ||
fs_path: &Path, | ||||
is_at_repo_root: bool, | ||||
) -> Result<Vec<DirEntry>, ()> { | ||||
|
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))) | ||||
|
r47885 | } | ||
|
r48268 | fn check_for_outdated_directory_cache( | ||
&self, | ||||
dirstate_node: &NodeRef<'tree, 'on_disk>, | ||||
) -> Result<(), DirstateV2ParseError> { | ||||
if self.ignore_patterns_have_changed == Some(true) | ||||
&& dirstate_node.cached_directory_mtime().is_some() | ||||
{ | ||||
self.outated_cached_directories.lock().unwrap().push( | ||||
dirstate_node | ||||
.full_path_borrowed(self.dmap.on_disk)? | ||||
.detach_from_tree(), | ||||
) | ||||
} | ||||
Ok(()) | ||||
} | ||||
|
r48138 | /// If this returns true, we can get accurate results by only using | ||
/// `symlink_metadata` for child nodes that exist in the dirstate and don’t | ||||
/// need to call `read_dir`. | ||||
fn can_skip_fs_readdir( | ||||
&self, | ||||
directory_metadata: Option<&std::fs::Metadata>, | ||||
cached_directory_mtime: Option<&Timestamp>, | ||||
) -> bool { | ||||
if !self.options.list_unknown && !self.options.list_ignored { | ||||
// All states that we care about listing have corresponding | ||||
// dirstate entries. | ||||
// This happens for example with `hg status -mard`. | ||||
return true; | ||||
} | ||||
|
r48269 | if !self.options.list_ignored | ||
&& self.ignore_patterns_have_changed == Some(false) | ||||
{ | ||||
if let Some(cached_mtime) = cached_directory_mtime { | ||||
// The dirstate contains a cached mtime for this directory, set | ||||
// by a previous run of the `status` algorithm which found this | ||||
// directory eligible for `read_dir` caching. | ||||
if let Some(meta) = directory_metadata { | ||||
if let Ok(current_mtime) = meta.modified() { | ||||
if current_mtime == cached_mtime.into() { | ||||
// The mtime of that directory has not changed | ||||
// since then, which means that the results of | ||||
// `read_dir` should also be unchanged. | ||||
return true; | ||||
} | ||||
|
r48138 | } | ||
} | ||||
} | ||||
} | ||||
false | ||||
} | ||||
|
r48269 | /// Returns whether all child entries of the filesystem directory have a | ||
/// corresponding dirstate node or are ignored. | ||||
|
r47883 | fn traverse_fs_directory_and_dirstate( | ||
|
r47887 | &self, | ||
|
r47883 | has_ignored_ancestor: bool, | ||
|
r48136 | dirstate_nodes: ChildNodesRef<'tree, 'on_disk>, | ||
directory_hg_path: &BorrowedPath<'tree, 'on_disk>, | ||||
|
r47885 | directory_fs_path: &Path, | ||
|
r48138 | directory_metadata: Option<&std::fs::Metadata>, | ||
cached_directory_mtime: Option<&Timestamp>, | ||||
|
r47883 | is_at_repo_root: bool, | ||
|
r48138 | ) -> Result<bool, DirstateV2ParseError> { | ||
if self.can_skip_fs_readdir(directory_metadata, cached_directory_mtime) | ||||
{ | ||||
dirstate_nodes | ||||
|
r48129 | .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)) | ||||
} | ||||
} | ||||
}) | ||||
|
r48138 | .collect::<Result<_, _>>()?; | ||
|
r48269 | // We don’t know, so conservatively say this isn’t the case | ||
let children_all_have_dirstate_node_or_are_ignored = false; | ||||
|
r48138 | |||
|
r48269 | return Ok(children_all_have_dirstate_node_or_are_ignored); | ||
|
r48129 | } | ||
|
r47885 | let mut fs_entries = if let Ok(entries) = self.read_dir( | ||
directory_hg_path, | ||||
directory_fs_path, | ||||
is_at_repo_root, | ||||
) { | ||||
entries | ||||
} else { | ||||
|
r48135 | // Treat an unreadable directory (typically because of insufficient | ||
// permissions) like an empty directory. `self.read_dir` has | ||||
// already called `self.io_error` so a warning will be emitted. | ||||
Vec::new() | ||||
|
r47885 | }; | ||
|
r47883 | |||
// `merge_join_by` requires both its input iterators to be sorted: | ||||
|
r48124 | let dirstate_nodes = dirstate_nodes.sorted(); | ||
|
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)); | ||||
|
r48126 | // Propagate here any error that would happen inside the comparison | ||
// callback below | ||||
for dirstate_node in &dirstate_nodes { | ||||
|
r48127 | dirstate_node.base_name(self.dmap.on_disk)?; | ||
|
r48126 | } | ||
|
r47887 | itertools::merge_join_by( | ||
|
r47883 | dirstate_nodes, | ||
&fs_entries, | ||||
|
r48124 | |dirstate_node, fs_entry| { | ||
|
r48126 | // This `unwrap` never panics because we already propagated | ||
// those errors above | ||||
|
r48127 | dirstate_node | ||
.base_name(self.dmap.on_disk) | ||||
.unwrap() | ||||
.cmp(&fs_entry.base_name) | ||||
|
r47883 | }, | ||
|
r47887 | ) | ||
.par_bridge() | ||||
|
r48126 | .map(|pair| { | ||
|
r47883 | use itertools::EitherOrBoth::*; | ||
|
r48269 | let has_dirstate_node_or_is_ignored; | ||
|
r47883 | match pair { | ||
|
r48269 | Both(dirstate_node, fs_entry) => { | ||
self.traverse_fs_and_dirstate( | ||||
|
r48129 | &fs_entry.full_path, | ||
&fs_entry.metadata, | ||||
|
r47883 | dirstate_node, | ||
has_ignored_ancestor, | ||||
|
r48269 | )?; | ||
has_dirstate_node_or_is_ignored = true | ||||
} | ||||
|
r48124 | Left(dirstate_node) => { | ||
|
r48269 | self.traverse_dirstate_only(dirstate_node)?; | ||
has_dirstate_node_or_is_ignored = true; | ||||
|
r48124 | } | ||
|
r48269 | Right(fs_entry) => { | ||
has_dirstate_node_or_is_ignored = self.traverse_fs_only( | ||||
has_ignored_ancestor, | ||||
directory_hg_path, | ||||
fs_entry, | ||||
) | ||||
} | ||||
|
r47883 | } | ||
|
r48269 | Ok(has_dirstate_node_or_is_ignored) | ||
|
r47887 | }) | ||
|
r48269 | .try_reduce(|| true, |a, b| Ok(a && b)) | ||
|
r47883 | } | ||
fn traverse_fs_and_dirstate( | ||||
|
r47887 | &self, | ||
|
r48129 | fs_path: &Path, | ||
fs_metadata: &std::fs::Metadata, | ||||
|
r48136 | dirstate_node: NodeRef<'tree, 'on_disk>, | ||
|
r47883 | has_ignored_ancestor: bool, | ||
|
r48126 | ) -> Result<(), DirstateV2ParseError> { | ||
|
r48268 | self.check_for_outdated_directory_cache(&dirstate_node)?; | ||
|
r48136 | let hg_path = &dirstate_node.full_path_borrowed(self.dmap.on_disk)?; | ||
|
r48129 | let file_type = fs_metadata.file_type(); | ||
|
r47884 | let file_or_symlink = file_type.is_file() || file_type.is_symlink(); | ||
if !file_or_symlink { | ||||
|
r47883 | // If we previously had a file here, it was removed (with | ||
// `hg rm` or similar) or deleted before it could be | ||||
|
r47884 | // replaced by a directory or something else. | ||
|
r47883 | self.mark_removed_or_deleted_if_file( | ||
|
r48136 | &hg_path, | ||
|
r48126 | dirstate_node.state()?, | ||
|
r47883 | ); | ||
|
r47884 | } | ||
if file_type.is_dir() { | ||||
if self.options.collect_traversed_dirs { | ||||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.traversed | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47884 | } | ||
|
r47883 | let is_ignored = has_ignored_ancestor || (self.ignore_fn)(hg_path); | ||
let is_at_repo_root = false; | ||||
|
r48269 | let children_all_have_dirstate_node_or_are_ignored = self | ||
|
r48138 | .traverse_fs_directory_and_dirstate( | ||
is_ignored, | ||||
dirstate_node.children(self.dmap.on_disk)?, | ||||
hg_path, | ||||
fs_path, | ||||
Some(fs_metadata), | ||||
dirstate_node.cached_directory_mtime(), | ||||
is_at_repo_root, | ||||
)?; | ||||
self.maybe_save_directory_mtime( | ||||
|
r48269 | children_all_have_dirstate_node_or_are_ignored, | ||
|
r48138 | fs_metadata, | ||
dirstate_node, | ||||
|
r48126 | )? | ||
|
r47883 | } else { | ||
|
r47884 | if file_or_symlink && self.matcher.matches(hg_path) { | ||
|
r48126 | if let Some(state) = dirstate_node.state()? { | ||
|
r48124 | match state { | ||
|
r48136 | EntryState::Added => self | ||
.outcome | ||||
.lock() | ||||
.unwrap() | ||||
.added | ||||
.push(hg_path.detach_from_tree()), | ||||
|
r47887 | EntryState::Removed => self | ||
.outcome | ||||
.lock() | ||||
.unwrap() | ||||
.removed | ||||
|
r48136 | .push(hg_path.detach_from_tree()), | ||
|
r47887 | EntryState::Merged => self | ||
.outcome | ||||
.lock() | ||||
.unwrap() | ||||
.modified | ||||
|
r48136 | .push(hg_path.detach_from_tree()), | ||
|
r48129 | EntryState::Normal => self | ||
.handle_normal_file(&dirstate_node, fs_metadata)?, | ||||
|
r47883 | } | ||
} else { | ||||
// `node.entry.is_none()` indicates a "directory" | ||||
// node, but the filesystem has a file | ||||
|
r48269 | self.mark_unknown_or_ignored( | ||
has_ignored_ancestor, | ||||
hg_path, | ||||
); | ||||
|
r47883 | } | ||
} | ||||
|
r48127 | for child_node in dirstate_node.children(self.dmap.on_disk)?.iter() | ||
{ | ||||
|
r48126 | self.traverse_dirstate_only(child_node)? | ||
|
r47883 | } | ||
} | ||||
|
r48126 | Ok(()) | ||
|
r47883 | } | ||
|
r48138 | fn maybe_save_directory_mtime( | ||
&self, | ||||
|
r48269 | children_all_have_dirstate_node_or_are_ignored: bool, | ||
|
r48138 | directory_metadata: &std::fs::Metadata, | ||
dirstate_node: NodeRef<'tree, 'on_disk>, | ||||
) -> Result<(), DirstateV2ParseError> { | ||||
|
r48269 | if children_all_have_dirstate_node_or_are_ignored { | ||
|
r48138 | // All filesystem directory entries from `read_dir` have a | ||
// corresponding node in the dirstate, so we can reconstitute the | ||||
// names of those entries without calling `read_dir` again. | ||||
if let (Some(status_start), Ok(directory_mtime)) = ( | ||||
&self.filesystem_time_at_status_start, | ||||
directory_metadata.modified(), | ||||
) { | ||||
// Although the Rust standard library’s `SystemTime` type | ||||
// has nanosecond precision, the times reported for a | ||||
// directory’s (or file’s) modified time may have lower | ||||
// resolution based on the filesystem (for example ext3 | ||||
// only stores integer seconds), kernel (see | ||||
// https://stackoverflow.com/a/14393315/1162888), etc. | ||||
if &directory_mtime >= status_start { | ||||
// The directory was modified too recently, don’t cache its | ||||
// `read_dir` results. | ||||
// | ||||
// A timeline like this is possible: | ||||
// | ||||
// 1. A change to this directory (direct child was | ||||
// added or removed) cause its mtime to be set | ||||
// (possibly truncated) to `directory_mtime` | ||||
// 2. This `status` algorithm calls `read_dir` | ||||
// 3. An other change is made to the same directory is | ||||
// made so that calling `read_dir` agin would give | ||||
// different results, but soon enough after 1. that | ||||
// the mtime stays the same | ||||
// | ||||
// On a system where the time resolution poor, this | ||||
// scenario is not unlikely if all three steps are caused | ||||
// by the same script. | ||||
} else { | ||||
// We’ve observed (through `status_start`) that time has | ||||
// “progressed” since `directory_mtime`, so any further | ||||
// change to this directory is extremely likely to cause a | ||||
// different mtime. | ||||
// | ||||
// Having the same mtime again is not entirely impossible | ||||
// since the system clock is not monotonous. It could jump | ||||
// backward to some point before `directory_mtime`, then a | ||||
// directory change could potentially happen during exactly | ||||
// the wrong tick. | ||||
// | ||||
// We deem this scenario (unlike the previous one) to be | ||||
// unlikely enough in practice. | ||||
let timestamp = directory_mtime.into(); | ||||
let cached = dirstate_node.cached_directory_mtime(); | ||||
if cached != Some(×tamp) { | ||||
let hg_path = dirstate_node | ||||
.full_path_borrowed(self.dmap.on_disk)? | ||||
.detach_from_tree(); | ||||
|
r48202 | self.new_cachable_directories | ||
|
r48138 | .lock() | ||
.unwrap() | ||||
.push((hg_path, timestamp)) | ||||
} | ||||
} | ||||
} | ||||
} | ||||
Ok(()) | ||||
} | ||||
|
r47883 | /// A file with `EntryState::Normal` in the dirstate was found in the | ||
/// filesystem | ||||
fn handle_normal_file( | ||||
|
r47887 | &self, | ||
|
r48136 | dirstate_node: &NodeRef<'tree, 'on_disk>, | ||
|
r48129 | fs_metadata: &std::fs::Metadata, | ||
|
r48126 | ) -> Result<(), DirstateV2ParseError> { | ||
|
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 | ||||
} | ||||
|
r48124 | let entry = dirstate_node | ||
|
r48126 | .entry()? | ||
|
r48124 | .expect("handle_normal_file called with entry-less node"); | ||
|
r48136 | let hg_path = &dirstate_node.full_path_borrowed(self.dmap.on_disk)?; | ||
|
r48129 | let mode_changed = | ||
|| self.options.check_exec && entry.mode_changed(fs_metadata); | ||||
|
r48834 | let size = entry.size(); | ||
let size_changed = size != truncate_u64(fs_metadata.len()); | ||||
if size >= 0 && size_changed && fs_metadata.file_type().is_symlink() { | ||||
|
r47883 | // issue6456: Size returned may be longer due to encryption | ||
// on EXT-4 fscrypt. TODO maybe only do it on EXT4? | ||||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.unsure | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r48126 | } else if dirstate_node.has_copy_source() | ||
|
r47883 | || entry.is_from_other_parent() | ||
|
r48834 | || (size >= 0 && (size_changed || mode_changed())) | ||
|
r47883 | { | ||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.modified | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } else { | ||
|
r48129 | let mtime = mtime_seconds(fs_metadata); | ||
|
r48834 | if truncate_i64(mtime) != entry.mtime() | ||
|
r47883 | || mtime == self.options.last_normal_time | ||
{ | ||||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.unsure | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } else if self.options.list_clean { | ||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.clean | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } | ||
} | ||||
|
r48126 | Ok(()) | ||
|
r47883 | } | ||
/// A node in the dirstate tree has no corresponding filesystem entry | ||||
|
r48126 | fn traverse_dirstate_only( | ||
&self, | ||||
|
r48136 | dirstate_node: NodeRef<'tree, 'on_disk>, | ||
|
r48126 | ) -> Result<(), DirstateV2ParseError> { | ||
|
r48268 | self.check_for_outdated_directory_cache(&dirstate_node)?; | ||
|
r48124 | self.mark_removed_or_deleted_if_file( | ||
|
r48136 | &dirstate_node.full_path_borrowed(self.dmap.on_disk)?, | ||
|
r48126 | dirstate_node.state()?, | ||
|
r48124 | ); | ||
dirstate_node | ||||
|
r48127 | .children(self.dmap.on_disk)? | ||
|
r48124 | .par_iter() | ||
|
r48126 | .map(|child_node| self.traverse_dirstate_only(child_node)) | ||
.collect() | ||||
|
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( | ||||
|
r47887 | &self, | ||
|
r48136 | hg_path: &BorrowedPath<'tree, 'on_disk>, | ||
|
r47883 | dirstate_node_state: Option<EntryState>, | ||
) { | ||||
if let Some(state) = dirstate_node_state { | ||||
if self.matcher.matches(hg_path) { | ||||
if let EntryState::Removed = state { | ||||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.removed | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } else { | ||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.deleted | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } | ||
} | ||||
} | ||||
} | ||||
/// Something in the filesystem has no corresponding dirstate node | ||||
|
r48269 | /// | ||
/// Returns whether that path is ignored | ||||
|
r47883 | fn traverse_fs_only( | ||
|
r47887 | &self, | ||
|
r47883 | has_ignored_ancestor: bool, | ||
directory_hg_path: &HgPath, | ||||
fs_entry: &DirEntry, | ||||
|
r48269 | ) -> bool { | ||
|
r47883 | let hg_path = directory_hg_path.join(&fs_entry.base_name); | ||
|
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() { | ||||
|
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; | ||||
|
r47885 | if let Ok(children_fs_entries) = self.read_dir( | ||
&hg_path, | ||||
&fs_entry.full_path, | ||||
is_at_repo_root, | ||||
) { | ||||
|
r47887 | children_fs_entries.par_iter().for_each(|child_fs_entry| { | ||
|
r47885 | self.traverse_fs_only( | ||
is_ignored, | ||||
&hg_path, | ||||
|
r47887 | child_fs_entry, | ||
|
r48269 | ); | ||
|
r47887 | }) | ||
|
r47883 | } | ||
} | ||||
if self.options.collect_traversed_dirs { | ||||
|
r47887 | self.outcome.lock().unwrap().traversed.push(hg_path.into()) | ||
|
r47883 | } | ||
|
r48269 | is_ignored | ||
} else { | ||||
if file_or_symlink { | ||||
if self.matcher.matches(&hg_path) { | ||||
self.mark_unknown_or_ignored( | ||||
has_ignored_ancestor, | ||||
&BorrowedPath::InMemory(&hg_path), | ||||
) | ||||
} else { | ||||
// We haven’t computed whether this path is ignored. It | ||||
// might not be, and a future run of status might have a | ||||
// different matcher that matches it. So treat it as not | ||||
// ignored. That is, inhibit readdir caching of the parent | ||||
// directory. | ||||
false | ||||
} | ||||
} else { | ||||
// This is neither a directory, a plain file, or a symlink. | ||||
// Treat it like an ignored file. | ||||
true | ||||
} | ||||
|
r47883 | } | ||
} | ||||
|
r48269 | /// Returns whether that path is ignored | ||
|
r47883 | fn mark_unknown_or_ignored( | ||
|
r47887 | &self, | ||
|
r47883 | has_ignored_ancestor: bool, | ||
|
r48136 | hg_path: &BorrowedPath<'_, 'on_disk>, | ||
|
r48269 | ) -> bool { | ||
|
r47883 | let is_ignored = has_ignored_ancestor || (self.ignore_fn)(&hg_path); | ||
if is_ignored { | ||||
if self.options.list_ignored { | ||||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.ignored | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } | ||
} else { | ||||
if self.options.list_unknown { | ||||
|
r48136 | self.outcome | ||
.lock() | ||||
.unwrap() | ||||
.unknown | ||||
.push(hg_path.detach_from_tree()) | ||||
|
r47883 | } | ||
} | ||||
|
r48269 | is_ignored | ||
|
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) | ||||
} | ||||
} | ||||
|
r48138 | |||
/// Return the `mtime` of a temporary file newly-created in the `.hg` directory | ||||
/// of the give repository. | ||||
/// | ||||
/// This is similar to `SystemTime::now()`, with the result truncated to the | ||||
/// same time resolution as other files’ modification times. Using `.hg` | ||||
/// instead of the system’s default temporary directory (such as `/tmp`) makes | ||||
/// it more likely the temporary file is in the same disk partition as contents | ||||
/// of the working directory, which can matter since different filesystems may | ||||
/// store timestamps with different resolutions. | ||||
/// | ||||
/// This may fail, typically if we lack write permissions. In that case we | ||||
/// should continue the `status()` algoritm anyway and consider the current | ||||
/// date/time to be unknown. | ||||
fn filesystem_now(repo_root: &Path) -> Result<SystemTime, io::Error> { | ||||
tempfile::tempfile_in(repo_root.join(".hg"))? | ||||
.metadata()? | ||||
.modified() | ||||
} | ||||