mercurial-scm/hg-stable: rust/hg-core/src/dirstate

annotate rust/hg-core/src/dirstate_tree/status.rs @ 47341:69530e5d4fe5

dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums They are used instead of `&Node` and `&ChildNodes` respectively. The `ChildNodes` type alias also becomes a similar enum. For now they only have one variant each, to be extended later. Adding enums now forces various use sites go through new methods instead of manipulating the underlying data structure directly. Differential Revision: https://phab.mercurial-scm.org/D10747

author	Simon Sapin <simon.sapin@octobus.net>
date	Wed, 19 May 2021 13:15:00 +0200
parents	0252600fd1cf
children	ed1583a845d2

rev	line source
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	1 use crate::dirstate::status::IgnoreFnType;
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	2 use crate::dirstate_tree::dirstate_map::ChildNodesRef;
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	3 use crate::dirstate_tree::dirstate_map::DirstateMap;
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	4 use crate::dirstate_tree::dirstate_map::NodeRef;
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	5 use crate::matchers::get_ignore_function;
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	6 use crate::matchers::Matcher;
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	7 use crate::utils::files::get_bytes_from_os_string;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	8 use crate::utils::hg_path::HgPath;
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	9 use crate::BadMatch;
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	10 use crate::DirstateStatus;
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	11 use crate::EntryState;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	12 use crate::HgPathBuf;
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	13 use crate::PatternFileWarning;
d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	14 use crate::StatusError;
d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	15 use crate::StatusOptions;
47132 c92e63762573 dirstate-tree: Add #[timed] attribute to `status` and `DirstateMap::read` Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	16 use micro_timer::timed;
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	17 use rayon::prelude::*;
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	18 use std::borrow::Cow;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	19 use std::io;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	20 use std::path::Path;
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	21 use std::path::PathBuf;
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	22 use std::sync::Mutex;
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	23
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	24 /// Returns the status of the working directory compared to its parent
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	25 /// changeset.
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	26 ///
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	27 /// This algorithm is based on traversing the filesystem tree (`fs` in function
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	28 /// and variable names) and dirstate tree at the same time. The core of this
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	29 /// traversal is the recursive `traverse_fs_directory_and_dirstate` function
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	30 /// and its use of `itertools::merge_join_by`. When reaching a path that only
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	31 /// exists in one of the two trees, depending on information requested by
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	32 /// `options` we may need to traverse the remaining subtree.
47132 c92e63762573 dirstate-tree: Add #[timed] attribute to `status` and `DirstateMap::read` Simon Sapin <simon.sapin@octobus.net> parents: 47131 diff changeset	33 #[timed]
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	34 pub fn status<'tree>(
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	35 dmap: &'tree mut DirstateMap,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	36 matcher: &(dyn Matcher + Sync),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	37 root_dir: PathBuf,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	38 ignore_files: Vec<PathBuf>,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	39 options: StatusOptions,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	40 ) -> Result<(DirstateStatus<'tree>, Vec<PatternFileWarning>), StatusError> {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	41 let (ignore_fn, warnings): (IgnoreFnType, _) =
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	42 if options.list_ignored \|\| options.list_unknown {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	43 get_ignore_function(ignore_files, &root_dir)?
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	44 } else {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	45 (Box::new(\|&_\| true), vec![])
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	46 };
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	47
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	48 let common = StatusCommon {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	49 options,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	50 matcher,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	51 ignore_fn,
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	52 outcome: Mutex::new(DirstateStatus::default()),
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	53 };
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	54 let is_at_repo_root = true;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	55 let hg_path = HgPath::new("");
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	56 let has_ignored_ancestor = false;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	57 common.traverse_fs_directory_and_dirstate(
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	58 has_ignored_ancestor,
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	59 dmap.root.as_ref(),
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	60 hg_path,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	61 &root_dir,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	62 is_at_repo_root,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	63 );
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	64 Ok((common.outcome.into_inner().unwrap(), warnings))
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	65 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	66
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	67 /// Bag of random things needed by various parts of the algorithm. Reduces the
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	68 /// number of parameters passed to functions.
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	69 struct StatusCommon<'tree, 'a> {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	70 options: StatusOptions,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	71 matcher: &'a (dyn Matcher + Sync),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	72 ignore_fn: IgnoreFnType<'a>,
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	73 outcome: Mutex<DirstateStatus<'tree>>,
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	74 }
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	75
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	76 impl<'tree, 'a> StatusCommon<'tree, 'a> {
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	77 fn read_dir(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	78 &self,
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	79 hg_path: &HgPath,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	80 fs_path: &Path,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	81 is_at_repo_root: bool,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	82 ) -> Result<Vec<DirEntry>, ()> {
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	83 DirEntry::read_dir(fs_path, is_at_repo_root).map_err(\|error\| {
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	84 let errno = error.raw_os_error().expect("expected real OS error");
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	85 self.outcome
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	86 .lock()
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	87 .unwrap()
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	88 .bad
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	89 .push((hg_path.to_owned().into(), BadMatch::OsError(errno)))
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	90 })
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	91 }
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	92
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	93 fn traverse_fs_directory_and_dirstate(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	94 &self,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	95 has_ignored_ancestor: bool,
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	96 dirstate_nodes: ChildNodesRef<'tree, '_>,
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	97 directory_hg_path: &'tree HgPath,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	98 directory_fs_path: &Path,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	99 is_at_repo_root: bool,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	100 ) {
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	101 let mut fs_entries = if let Ok(entries) = self.read_dir(
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	102 directory_hg_path,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	103 directory_fs_path,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	104 is_at_repo_root,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	105 ) {
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	106 entries
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	107 } else {
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	108 return;
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	109 };
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	110
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	111 // `merge_join_by` requires both its input iterators to be sorted:
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	112
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	113 let dirstate_nodes = dirstate_nodes.sorted();
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	114 // `sort_unstable_by_key` doesn’t allow keys borrowing from the value:
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	115 // https://github.com/rust-lang/rust/issues/34162
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	116 fs_entries.sort_unstable_by(\|e1, e2\| e1.base_name.cmp(&e2.base_name));
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	117
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	118 itertools::merge_join_by(
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	119 dirstate_nodes,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	120 &fs_entries,
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	121 \|dirstate_node, fs_entry\| {
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	122 dirstate_node.base_name().cmp(&fs_entry.base_name)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	123 },
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	124 )
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	125 .par_bridge()
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	126 .for_each(\|pair\| {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	127 use itertools::EitherOrBoth::*;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	128 match pair {
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	129 Both(dirstate_node, fs_entry) => {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	130 self.traverse_fs_and_dirstate(
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	131 fs_entry,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	132 dirstate_node,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	133 has_ignored_ancestor,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	134 );
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	135 }
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	136 Left(dirstate_node) => {
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	137 self.traverse_dirstate_only(dirstate_node)
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	138 }
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	139 Right(fs_entry) => self.traverse_fs_only(
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	140 has_ignored_ancestor,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	141 directory_hg_path,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	142 fs_entry,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	143 ),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	144 }
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	145 })
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	146 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	147
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	148 fn traverse_fs_and_dirstate(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	149 &self,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	150 fs_entry: &DirEntry,
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	151 dirstate_node: NodeRef<'tree, '_>,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	152 has_ignored_ancestor: bool,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	153 ) {
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	154 let hg_path = dirstate_node.full_path();
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	155 let file_type = fs_entry.metadata.file_type();
aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	156 let file_or_symlink = file_type.is_file() \|\| file_type.is_symlink();
aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	157 if !file_or_symlink {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	158 // If we previously had a file here, it was removed (with
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	159 // `hg rm` or similar) or deleted before it could be
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	160 // replaced by a directory or something else.
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	161 self.mark_removed_or_deleted_if_file(
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	162 dirstate_node.full_path(),
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	163 dirstate_node.state(),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	164 );
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	165 }
aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	166 if file_type.is_dir() {
aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	167 if self.options.collect_traversed_dirs {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	168 self.outcome.lock().unwrap().traversed.push(hg_path.into())
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	169 }
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	170 let is_ignored = has_ignored_ancestor \|\| (self.ignore_fn)(hg_path);
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	171 let is_at_repo_root = false;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	172 self.traverse_fs_directory_and_dirstate(
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	173 is_ignored,
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	174 dirstate_node.children(),
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	175 hg_path,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	176 &fs_entry.full_path,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	177 is_at_repo_root,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	178 );
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	179 } else {
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	180 if file_or_symlink && self.matcher.matches(hg_path) {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	181 let full_path = Cow::from(hg_path);
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	182 if let Some(state) = dirstate_node.state() {
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	183 match state {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	184 EntryState::Added => {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	185 self.outcome.lock().unwrap().added.push(full_path)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	186 }
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	187 EntryState::Removed => self
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	188 .outcome
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	189 .lock()
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	190 .unwrap()
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	191 .removed
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	192 .push(full_path),
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	193 EntryState::Merged => self
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	194 .outcome
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	195 .lock()
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	196 .unwrap()
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	197 .modified
60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	198 .push(full_path),
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	199 EntryState::Normal => {
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	200 self.handle_normal_file(&dirstate_node, fs_entry);
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	201 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	202 // This variant is not used in DirstateMap
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	203 // nodes
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	204 EntryState::Unknown => unreachable!(),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	205 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	206 } else {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	207 // `node.entry.is_none()` indicates a "directory"
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	208 // node, but the filesystem has a file
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	209 self.mark_unknown_or_ignored(
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	210 has_ignored_ancestor,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	211 full_path,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	212 )
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	213 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	214 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	215
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	216 for child_node in dirstate_node.children().iter() {
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	217 self.traverse_dirstate_only(child_node)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	218 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	219 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	220 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	221
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	222 /// A file with `EntryState::Normal` in the dirstate was found in the
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	223 /// filesystem
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	224 fn handle_normal_file(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	225 &self,
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	226 dirstate_node: &NodeRef<'tree, '_>,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	227 fs_entry: &DirEntry,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	228 ) {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	229 // Keep the low 31 bits
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	230 fn truncate_u64(value: u64) -> i32 {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	231 (value & 0x7FFF_FFFF) as i32
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	232 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	233 fn truncate_i64(value: i64) -> i32 {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	234 (value & 0x7FFF_FFFF) as i32
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	235 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	236
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	237 let entry = dirstate_node
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	238 .entry()
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	239 .expect("handle_normal_file called with entry-less node");
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	240 let full_path = Cow::from(dirstate_node.full_path());
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	241 let mode_changed = \|\| {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	242 self.options.check_exec && entry.mode_changed(&fs_entry.metadata)
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	243 };
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	244 let size_changed = entry.size != truncate_u64(fs_entry.metadata.len());
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	245 if entry.size >= 0
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	246 && size_changed
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	247 && fs_entry.metadata.file_type().is_symlink()
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	248 {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	249 // issue6456: Size returned may be longer due to encryption
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	250 // on EXT-4 fscrypt. TODO maybe only do it on EXT4?
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	251 self.outcome.lock().unwrap().unsure.push(full_path)
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	252 } else if dirstate_node.copy_source().is_some()
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	253 \|\| entry.is_from_other_parent()
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	254 \|\| (entry.size >= 0 && (size_changed \|\| mode_changed()))
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	255 {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	256 self.outcome.lock().unwrap().modified.push(full_path)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	257 } else {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	258 let mtime = mtime_seconds(&fs_entry.metadata);
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	259 if truncate_i64(mtime) != entry.mtime
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	260 \|\| mtime == self.options.last_normal_time
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	261 {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	262 self.outcome.lock().unwrap().unsure.push(full_path)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	263 } else if self.options.list_clean {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	264 self.outcome.lock().unwrap().clean.push(full_path)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	265 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	266 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	267 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	268
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	269 /// A node in the dirstate tree has no corresponding filesystem entry
47341 69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	270 fn traverse_dirstate_only(&self, dirstate_node: NodeRef<'tree, '_>) {
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	271 self.mark_removed_or_deleted_if_file(
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	272 dirstate_node.full_path(),
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	273 dirstate_node.state(),
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	274 );
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	275 dirstate_node
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	276 .children()
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	277 .par_iter()
69530e5d4fe5 dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums Simon Sapin <simon.sapin@octobus.net> parents: 47339 diff changeset	278 .for_each(\|child_node\| self.traverse_dirstate_only(child_node))
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	279 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	280
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	281 /// A node in the dirstate tree has no corresponding file on the
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	282 /// filesystem
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	283 ///
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	284 /// Does nothing on a "directory" node
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	285 fn mark_removed_or_deleted_if_file(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	286 &self,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	287 hg_path: &'tree HgPath,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	288 dirstate_node_state: Option<EntryState>,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	289 ) {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	290 if let Some(state) = dirstate_node_state {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	291 if self.matcher.matches(hg_path) {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	292 if let EntryState::Removed = state {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	293 self.outcome.lock().unwrap().removed.push(hg_path.into())
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	294 } else {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	295 self.outcome.lock().unwrap().deleted.push(hg_path.into())
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	296 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	297 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	298 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	299 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	300
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	301 /// Something in the filesystem has no corresponding dirstate node
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	302 fn traverse_fs_only(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	303 &self,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	304 has_ignored_ancestor: bool,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	305 directory_hg_path: &HgPath,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	306 fs_entry: &DirEntry,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	307 ) {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	308 let hg_path = directory_hg_path.join(&fs_entry.base_name);
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	309 let file_type = fs_entry.metadata.file_type();
aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	310 let file_or_symlink = file_type.is_file() \|\| file_type.is_symlink();
aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	311 if file_type.is_dir() {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	312 let is_ignored =
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	313 has_ignored_ancestor \|\| (self.ignore_fn)(&hg_path);
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	314 let traverse_children = if is_ignored {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	315 // Descendants of an ignored directory are all ignored
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	316 self.options.list_ignored
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	317 } else {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	318 // Descendants of an unknown directory may be either unknown or
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	319 // ignored
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	320 self.options.list_unknown \|\| self.options.list_ignored
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	321 };
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	322 if traverse_children {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	323 let is_at_repo_root = false;
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	324 if let Ok(children_fs_entries) = self.read_dir(
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	325 &hg_path,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	326 &fs_entry.full_path,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	327 is_at_repo_root,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	328 ) {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	329 children_fs_entries.par_iter().for_each(\|child_fs_entry\| {
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	330 self.traverse_fs_only(
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	331 is_ignored,
1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	332 &hg_path,
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	333 child_fs_entry,
47129 1b4f0f819f92 dirstate-tree: Handle I/O errors in status Simon Sapin <simon.sapin@octobus.net> parents: 47128 diff changeset	334 )
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	335 })
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	336 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	337 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	338 if self.options.collect_traversed_dirs {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	339 self.outcome.lock().unwrap().traversed.push(hg_path.into())
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	340 }
47128 aeb03758f37a dirstate-tree: Ignore FIFOs etc. in the status algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47127 diff changeset	341 } else if file_or_symlink && self.matcher.matches(&hg_path) {
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	342 self.mark_unknown_or_ignored(has_ignored_ancestor, hg_path.into())
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	343 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	344 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	345
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	346 fn mark_unknown_or_ignored(
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	347 &self,
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	348 has_ignored_ancestor: bool,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	349 hg_path: Cow<'tree, HgPath>,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	350 ) {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	351 let is_ignored = has_ignored_ancestor \|\| (self.ignore_fn)(&hg_path);
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	352 if is_ignored {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	353 if self.options.list_ignored {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	354 self.outcome.lock().unwrap().ignored.push(hg_path)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	355 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	356 } else {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	357 if self.options.list_unknown {
47131 60d852ae7e7b dirstate-tree: Paralellize the status algorithm with Rayon Simon Sapin <simon.sapin@octobus.net> parents: 47129 diff changeset	358 self.outcome.lock().unwrap().unknown.push(hg_path)
47127 be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	359 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	360 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	361 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	362 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	363
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	364 #[cfg(unix)] // TODO
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	365 fn mtime_seconds(metadata: &std::fs::Metadata) -> i64 {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	366 // Going through `Metadata::modified()` would be portable, but would take
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	367 // care to construct a `SystemTime` value with sub-second precision just
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	368 // for us to throw that away here.
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	369 use std::os::unix::fs::MetadataExt;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	370 metadata.mtime()
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	371 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	372
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	373 struct DirEntry {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	374 base_name: HgPathBuf,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	375 full_path: PathBuf,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	376 metadata: std::fs::Metadata,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	377 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	378
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	379 impl DirEntry {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	380 /// Returns unsorted entries in the given directory, with name and
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	381 /// metadata.
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	382 ///
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	383 /// If a `.hg` sub-directory is encountered:
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	384 ///
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	385 /// * At the repository root, ignore that sub-directory
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	386 /// * Elsewhere, we’re listing the content of a sub-repo. Return an empty
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	387 /// list instead.
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	388 fn read_dir(path: &Path, is_at_repo_root: bool) -> io::Result<Vec<Self>> {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	389 let mut results = Vec::new();
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	390 for entry in path.read_dir()? {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	391 let entry = entry?;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	392 let metadata = entry.metadata()?;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	393 let name = get_bytes_from_os_string(entry.file_name());
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	394 // FIXME don't do this when cached
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	395 if name == b".hg" {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	396 if is_at_repo_root {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	397 // Skip the repo’s own .hg (might be a symlink)
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	398 continue;
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	399 } else if metadata.is_dir() {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	400 // A .hg sub-directory at another location means a subrepo,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	401 // skip it entirely.
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	402 return Ok(Vec::new());
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	403 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	404 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	405 results.push(DirEntry {
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	406 base_name: name.into(),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	407 full_path: entry.path(),
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	408 metadata,
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	409 })
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	410 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	411 Ok(results)
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	412 }
be579775c2d9 dirstate-tree: Add the new `status()` algorithm Simon Sapin <simon.sapin@octobus.net> parents: 47126 diff changeset	413 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/dirstate_tree/status.rs @ 47341:69530e5d4fe5