annotate rust/hg-core/src/dirstate/status.rs @ 44748:a467416c493c stable

rust-status: check for '.hg' regardless of file type (issue6300) '.hg' would show up in `hg status` if were a symlink. Differential Revision: https://phab.mercurial-scm.org/D8461
author Raphaël Gomès <rgomes@octobus.net>
date Thu, 23 Apr 2020 09:59:38 +0200
parents d8b703b8bf70
children dc60ba32d43b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
1 // status.rs
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
2 //
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
4 //
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
5 // This software may be used and distributed according to the terms of the
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
6 // GNU General Public License version 2 or any later version.
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
7
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
8 //! Rust implementation of dirstate.status (dirstate.py).
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
9 //! It is currently missing a lot of functionality compared to the Python one
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
10 //! and will only be triggered in narrow cases.
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
11
43605
8210c3f46912 rust: introduce SIZE_FROM_OTHER_PARENT constant
Raphaël Gomès <rgomes@octobus.net>
parents: 43604
diff changeset
12 use crate::{
8210c3f46912 rust: introduce SIZE_FROM_OTHER_PARENT constant
Raphaël Gomès <rgomes@octobus.net>
parents: 43604
diff changeset
13 dirstate::SIZE_FROM_OTHER_PARENT,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
14 filepatterns::PatternFileWarning,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
15 matchers::{get_ignore_function, Matcher, VisitChildrenSet},
43605
8210c3f46912 rust: introduce SIZE_FROM_OTHER_PARENT constant
Raphaël Gomès <rgomes@octobus.net>
parents: 43604
diff changeset
16 utils::{
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
17 files::{find_dirs, HgMetadata},
44523
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
18 hg_path::{
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
19 hg_path_to_path_buf, os_string_to_hg_path_buf, HgPath, HgPathBuf,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
20 HgPathError,
44523
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
21 },
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
22 path_auditor::PathAuditor,
43605
8210c3f46912 rust: introduce SIZE_FROM_OTHER_PARENT constant
Raphaël Gomès <rgomes@octobus.net>
parents: 43604
diff changeset
23 },
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
24 CopyMap, DirstateEntry, DirstateMap, EntryState, FastHashMap,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
25 PatternError,
43605
8210c3f46912 rust: introduce SIZE_FROM_OTHER_PARENT constant
Raphaël Gomès <rgomes@octobus.net>
parents: 43604
diff changeset
26 };
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
27 use lazy_static::lazy_static;
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
28 use micro_timer::timed;
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
29 use rayon::prelude::*;
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
30 use std::{
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
31 borrow::Cow,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
32 collections::HashSet,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
33 fs::{read_dir, DirEntry},
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
34 io::ErrorKind,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
35 ops::Deref,
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
36 path::{Path, PathBuf},
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
37 };
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
38
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
39 /// Wrong type of file from a `BadMatch`
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
40 /// Note: a lot of those don't exist on all platforms.
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
41 #[derive(Debug, Copy, Clone)]
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
42 pub enum BadType {
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
43 CharacterDevice,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
44 BlockDevice,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
45 FIFO,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
46 Socket,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
47 Directory,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
48 Unknown,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
49 }
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
50
44529
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
51 impl ToString for BadType {
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
52 fn to_string(&self) -> String {
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
53 match self {
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
54 BadType::CharacterDevice => "character device",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
55 BadType::BlockDevice => "block device",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
56 BadType::FIFO => "fifo",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
57 BadType::Socket => "socket",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
58 BadType::Directory => "directory",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
59 BadType::Unknown => "unknown",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
60 }
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
61 .to_string()
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
62 }
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
63 }
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core
Raphaël Gomès <rgomes@octobus.net>
parents: 44528
diff changeset
64
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
65 /// Was explicitly matched but cannot be found/accessed
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
66 #[derive(Debug, Copy, Clone)]
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
67 pub enum BadMatch {
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
68 OsError(i32),
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
69 BadType(BadType),
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
70 }
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
71
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
72 /// Marker enum used to dispatch new status entries into the right collections.
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
73 /// Is similar to `crate::EntryState`, but represents the transient state of
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
74 /// entries during the lifetime of a command.
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
75 #[derive(Debug, Copy, Clone)]
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
76 enum Dispatch {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
77 Unsure,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
78 Modified,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
79 Added,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
80 Removed,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
81 Deleted,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
82 Clean,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
83 Unknown,
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
84 Ignored,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
85 /// Empty dispatch, the file is not worth listing
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
86 None,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
87 /// Was explicitly matched but cannot be found/accessed
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
88 Bad(BadMatch),
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
89 Directory {
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
90 /// True if the directory used to be a file in the dmap so we can say
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
91 /// that it's been removed.
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
92 was_file: bool,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
93 },
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
94 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
95
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
96 type IoResult<T> = std::io::Result<T>;
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
97 /// `Box<dyn Trait>` is syntactic sugar for `Box<dyn Trait, 'static>`, so add
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
98 /// an explicit lifetime here to not fight `'static` bounds "out of nowhere".
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
99 type IgnoreFnType<'a> = Box<dyn for<'r> Fn(&'r HgPath) -> bool + Sync + 'a>;
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
100
43604
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
101 /// Dates and times that are outside the 31-bit signed range are compared
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
102 /// modulo 2^31. This should prevent hg from behaving badly with very large
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
103 /// files or corrupt dates while still having a high probability of detecting
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
104 /// changes. (issue2608)
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
105 /// TODO I haven't found a way of having `b` be `Into<i32>`, since `From<u64>`
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
106 /// is not defined for `i32`, and there is no `As` trait. This forces the
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
107 /// caller to cast `b` as `i32`.
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
108 fn mod_compare(a: i32, b: i32) -> bool {
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
109 a & i32::max_value() != b & i32::max_value()
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
110 }
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
111
44523
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
112 /// Return a sorted list containing information about the entries
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
113 /// in the directory.
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
114 ///
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
115 /// * `skip_dot_hg` - Return an empty vec if `path` contains a `.hg` directory
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
116 fn list_directory(
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
117 path: impl AsRef<Path>,
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
118 skip_dot_hg: bool,
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
119 ) -> std::io::Result<Vec<(HgPathBuf, DirEntry)>> {
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
120 let mut results = vec![];
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
121 let entries = read_dir(path.as_ref())?;
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
122
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
123 for entry in entries {
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
124 let entry = entry?;
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
125 let filename = os_string_to_hg_path_buf(entry.file_name())?;
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
126 let file_type = entry.file_type()?;
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
127 if skip_dot_hg && filename.as_bytes() == b".hg" && file_type.is_dir() {
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
128 return Ok(vec![]);
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
129 } else {
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
130 results.push((HgPathBuf::from(filename), entry))
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
131 }
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
132 }
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
133
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
134 results.sort_unstable_by_key(|e| e.0.clone());
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
135 Ok(results)
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
136 }
0d97bcb3cee9 rust-status: add util for listing a directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44193
diff changeset
137
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
138 /// The file corresponding to the dirstate entry was found on the filesystem.
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
139 fn dispatch_found(
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
140 filename: impl AsRef<HgPath>,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
141 entry: DirstateEntry,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
142 metadata: HgMetadata,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
143 copy_map: &CopyMap,
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
144 options: StatusOptions,
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
145 ) -> Dispatch {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
146 let DirstateEntry {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
147 state,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
148 mode,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
149 mtime,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
150 size,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
151 } = entry;
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
152
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
153 let HgMetadata {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
154 st_mode,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
155 st_size,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
156 st_mtime,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
157 ..
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
158 } = metadata;
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
159
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
160 match state {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
161 EntryState::Normal => {
43604
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
162 let size_changed = mod_compare(size, st_size as i32);
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
163 let mode_changed =
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
164 (mode ^ st_mode as i32) & 0o100 != 0o000 && options.check_exec;
43604
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
165 let metadata_changed = size >= 0 && (size_changed || mode_changed);
43605
8210c3f46912 rust: introduce SIZE_FROM_OTHER_PARENT constant
Raphaël Gomès <rgomes@octobus.net>
parents: 43604
diff changeset
166 let other_parent = size == SIZE_FROM_OTHER_PARENT;
43604
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
167 if metadata_changed
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
168 || other_parent
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
169 || copy_map.contains_key(filename.as_ref())
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
170 {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
171 Dispatch::Modified
43604
51cd86735608 rust-status: refactor dispatch case for normal files
Raphaël Gomès <rgomes@octobus.net>
parents: 43603
diff changeset
172 } else if mod_compare(mtime, st_mtime as i32) {
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
173 Dispatch::Unsure
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
174 } else if st_mtime == options.last_normal_time {
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
175 // the file may have just been marked as normal and
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
176 // it may have changed in the same second without
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
177 // changing its size. This can happen if we quickly
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
178 // do multiple commits. Force lookup, so we don't
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
179 // miss such a racy file change.
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
180 Dispatch::Unsure
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
181 } else if options.list_clean {
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
182 Dispatch::Clean
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
183 } else {
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
184 Dispatch::None
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
185 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
186 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
187 EntryState::Merged => Dispatch::Modified,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
188 EntryState::Added => Dispatch::Added,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
189 EntryState::Removed => Dispatch::Removed,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
190 EntryState::Unknown => Dispatch::Unknown,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
191 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
192 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
193
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
194 /// The file corresponding to this Dirstate entry is missing.
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
195 fn dispatch_missing(state: EntryState) -> Dispatch {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
196 match state {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
197 // File was removed from the filesystem during commands
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
198 EntryState::Normal | EntryState::Merged | EntryState::Added => {
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
199 Dispatch::Deleted
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
200 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
201 // File was removed, everything is normal
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
202 EntryState::Removed => Dispatch::Removed,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
203 // File is unknown to Mercurial, everything is normal
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
204 EntryState::Unknown => Dispatch::Unknown,
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
205 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
206 }
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
207
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
208 lazy_static! {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
209 static ref DEFAULT_WORK: HashSet<&'static HgPath> = {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
210 let mut h = HashSet::new();
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
211 h.insert(HgPath::new(b""));
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
212 h
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
213 };
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
214 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
215
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
216 /// Get stat data about the files explicitly specified by match.
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
217 /// TODO subrepos
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
218 #[timed]
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
219 fn walk_explicit<'a>(
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
220 files: Option<&'a HashSet<&HgPath>>,
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
221 dmap: &'a DirstateMap,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
222 root_dir: impl AsRef<Path> + Sync + Send + 'a,
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
223 options: StatusOptions,
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
224 ) -> impl ParallelIterator<Item = IoResult<(&'a HgPath, Dispatch)>> {
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
225 files
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
226 .unwrap_or(&DEFAULT_WORK)
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
227 .par_iter()
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
228 .map(move |filename| {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
229 // TODO normalization
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
230 let normalized = filename.as_ref();
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
231
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
232 let buf = match hg_path_to_path_buf(normalized) {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
233 Ok(x) => x,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
234 Err(e) => return Some(Err(e.into())),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
235 };
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
236 let target = root_dir.as_ref().join(buf);
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
237 let st = target.symlink_metadata();
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
238 let in_dmap = dmap.get(normalized);
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
239 match st {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
240 Ok(meta) => {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
241 let file_type = meta.file_type();
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
242 return if file_type.is_file() || file_type.is_symlink() {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
243 if let Some(entry) = in_dmap {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
244 return Some(Ok((
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
245 normalized,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
246 dispatch_found(
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
247 &normalized,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
248 *entry,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
249 HgMetadata::from_metadata(meta),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
250 &dmap.copy_map,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
251 options,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
252 ),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
253 )));
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
254 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
255 Some(Ok((normalized, Dispatch::Unknown)))
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
256 } else {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
257 if file_type.is_dir() {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
258 Some(Ok((
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
259 normalized,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
260 Dispatch::Directory {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
261 was_file: in_dmap.is_some(),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
262 },
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
263 )))
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
264 } else {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
265 Some(Ok((
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
266 normalized,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
267 Dispatch::Bad(BadMatch::BadType(
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
268 // TODO do more than unknown
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
269 // Support for all `BadType` variant
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
270 // varies greatly between platforms.
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
271 // So far, no tests check the type and
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
272 // this should be good enough for most
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
273 // users.
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
274 BadType::Unknown,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
275 )),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
276 )))
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
277 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
278 };
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
279 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
280 Err(_) => {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
281 if let Some(entry) = in_dmap {
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
282 return Some(Ok((
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
283 normalized,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
284 dispatch_missing(entry.state),
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
285 )));
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
286 }
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
287 }
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
288 };
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
289 None
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
290 })
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
291 .flatten()
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
292 }
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
293
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
294 #[derive(Debug, Copy, Clone)]
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
295 pub struct StatusOptions {
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
296 /// Remember the most recent modification timeslot for status, to make
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
297 /// sure we won't miss future size-preserving file content modifications
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
298 /// that happen within the same timeslot.
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
299 pub last_normal_time: i64,
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
300 /// Whether we are on a filesystem with UNIX-like exec flags
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
301 pub check_exec: bool,
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
302 pub list_clean: bool,
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
303 pub list_unknown: bool,
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
304 pub list_ignored: bool,
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
305 }
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
306
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
307 /// Dispatch a single entry (file, folder, symlink...) found during `traverse`.
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
308 /// If the entry is a folder that needs to be traversed, it will be handled
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
309 /// in a separate thread.
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
310 fn handle_traversed_entry<'a>(
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
311 scope: &rayon::Scope<'a>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
312 files_sender: &'a crossbeam::Sender<IoResult<(HgPathBuf, Dispatch)>>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
313 matcher: &'a (impl Matcher + Sync),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
314 root_dir: impl AsRef<Path> + Sync + Send + Copy + 'a,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
315 dmap: &'a DirstateMap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
316 old_results: &'a FastHashMap<Cow<HgPath>, Dispatch>,
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
317 ignore_fn: &'a IgnoreFnType,
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
318 dir_ignore_fn: &'a IgnoreFnType,
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
319 options: StatusOptions,
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
320 filename: HgPathBuf,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
321 dir_entry: DirEntry,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
322 ) -> IoResult<()> {
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
323 let file_type = dir_entry.file_type()?;
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
324 let entry_option = dmap.get(&filename);
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
325
44748
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300)
Raphaël Gomès <rgomes@octobus.net>
parents: 44747
diff changeset
326 if filename.as_bytes() == b".hg" {
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300)
Raphaël Gomès <rgomes@octobus.net>
parents: 44747
diff changeset
327 // Could be a directory or a symlink
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300)
Raphaël Gomès <rgomes@octobus.net>
parents: 44747
diff changeset
328 return Ok(());
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300)
Raphaël Gomès <rgomes@octobus.net>
parents: 44747
diff changeset
329 }
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300)
Raphaël Gomès <rgomes@octobus.net>
parents: 44747
diff changeset
330
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
331 if file_type.is_dir() {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
332 handle_traversed_dir(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
333 scope,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
334 files_sender,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
335 matcher,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
336 root_dir,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
337 dmap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
338 old_results,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
339 ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
340 dir_ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
341 options,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
342 entry_option,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
343 filename,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
344 );
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
345 } else if file_type.is_file() || file_type.is_symlink() {
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
346 if let Some(entry) = entry_option {
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
347 if matcher.matches_everything() || matcher.matches(&filename) {
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
348 let metadata = dir_entry.metadata()?;
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
349 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
350 .send(Ok((
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
351 filename.to_owned(),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
352 dispatch_found(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
353 &filename,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
354 *entry,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
355 HgMetadata::from_metadata(metadata),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
356 &dmap.copy_map,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
357 options,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
358 ),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
359 )))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
360 .unwrap();
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
361 }
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
362 } else if (matcher.matches_everything() || matcher.matches(&filename))
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
363 && !ignore_fn(&filename)
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
364 {
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
365 if (options.list_ignored || matcher.exact_match(&filename))
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
366 && dir_ignore_fn(&filename)
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
367 {
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
368 if options.list_ignored {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
369 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
370 .send(Ok((filename.to_owned(), Dispatch::Ignored)))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
371 .unwrap();
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
372 }
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
373 } else {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
374 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
375 .send(Ok((filename.to_owned(), Dispatch::Unknown)))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
376 .unwrap();
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
377 }
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
378 } else if ignore_fn(&filename) && options.list_ignored {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
379 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
380 .send(Ok((filename.to_owned(), Dispatch::Ignored)))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
381 .unwrap();
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
382 }
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
383 } else if let Some(entry) = entry_option {
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
384 // Used to be a file or a folder, now something else.
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
385 if matcher.matches_everything() || matcher.matches(&filename) {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
386 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
387 .send(Ok((filename.to_owned(), dispatch_missing(entry.state))))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
388 .unwrap();
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
389 }
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
390 }
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
391
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
392 Ok(())
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
393 }
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
394
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
395 /// A directory was found in the filesystem and needs to be traversed
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
396 fn handle_traversed_dir<'a>(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
397 scope: &rayon::Scope<'a>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
398 files_sender: &'a crossbeam::Sender<IoResult<(HgPathBuf, Dispatch)>>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
399 matcher: &'a (impl Matcher + Sync),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
400 root_dir: impl AsRef<Path> + Sync + Send + Copy + 'a,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
401 dmap: &'a DirstateMap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
402 old_results: &'a FastHashMap<Cow<HgPath>, Dispatch>,
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
403 ignore_fn: &'a IgnoreFnType,
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
404 dir_ignore_fn: &'a IgnoreFnType,
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
405 options: StatusOptions,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
406 entry_option: Option<&'a DirstateEntry>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
407 directory: HgPathBuf,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
408 ) {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
409 scope.spawn(move |_| {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
410 // Nested `if` until `rust-lang/rust#53668` is stable
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
411 if let Some(entry) = entry_option {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
412 // Used to be a file, is now a folder
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
413 if matcher.matches_everything() || matcher.matches(&directory) {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
414 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
415 .send(Ok((
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
416 directory.to_owned(),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
417 dispatch_missing(entry.state),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
418 )))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
419 .unwrap();
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
420 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
421 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
422 // Do we need to traverse it?
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
423 if !ignore_fn(&directory) || options.list_ignored {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
424 traverse_dir(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
425 files_sender,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
426 matcher,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
427 root_dir,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
428 dmap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
429 directory,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
430 &old_results,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
431 ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
432 dir_ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
433 options,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
434 )
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
435 .unwrap_or_else(|e| files_sender.send(Err(e)).unwrap())
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
436 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
437 });
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
438 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
439
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
440 /// Decides whether the directory needs to be listed, and if so handles the
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
441 /// entries in a separate thread.
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
442 fn traverse_dir<'a>(
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
443 files_sender: &crossbeam::Sender<IoResult<(HgPathBuf, Dispatch)>>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
444 matcher: &'a (impl Matcher + Sync),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
445 root_dir: impl AsRef<Path> + Sync + Send + Copy,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
446 dmap: &'a DirstateMap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
447 directory: impl AsRef<HgPath>,
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
448 old_results: &FastHashMap<Cow<'a, HgPath>, Dispatch>,
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
449 ignore_fn: &IgnoreFnType,
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
450 dir_ignore_fn: &IgnoreFnType,
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
451 options: StatusOptions,
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
452 ) -> IoResult<()> {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
453 let directory = directory.as_ref();
44748
a467416c493c rust-status: check for '.hg' regardless of file type (issue6300)
Raphaël Gomès <rgomes@octobus.net>
parents: 44747
diff changeset
454
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
455 let visit_entries = match matcher.visit_children_set(directory) {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
456 VisitChildrenSet::Empty => return Ok(()),
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
457 VisitChildrenSet::This | VisitChildrenSet::Recursive => None,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
458 VisitChildrenSet::Set(set) => Some(set),
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
459 };
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
460 let buf = hg_path_to_path_buf(directory)?;
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
461 let dir_path = root_dir.as_ref().join(buf);
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
462
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
463 let skip_dot_hg = !directory.as_bytes().is_empty();
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
464 let entries = match list_directory(dir_path, skip_dot_hg) {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
465 Err(e) => match e.kind() {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
466 ErrorKind::NotFound | ErrorKind::PermissionDenied => {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
467 files_sender
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
468 .send(Ok((
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
469 directory.to_owned(),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
470 Dispatch::Bad(BadMatch::OsError(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
471 // Unwrapping here is OK because the error always
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
472 // is a real os error
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
473 e.raw_os_error().unwrap(),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
474 )),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
475 )))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
476 .unwrap();
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
477 return Ok(());
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
478 }
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
479 _ => return Err(e),
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
480 },
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
481 Ok(entries) => entries,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
482 };
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
483
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
484 rayon::scope(|scope| -> IoResult<()> {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
485 for (filename, dir_entry) in entries {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
486 if let Some(ref set) = visit_entries {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
487 if !set.contains(filename.deref()) {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
488 continue;
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
489 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
490 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
491 // TODO normalize
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
492 let filename = if directory.is_empty() {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
493 filename.to_owned()
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
494 } else {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
495 directory.join(&filename)
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
496 };
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
497
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
498 if !old_results.contains_key(filename.deref()) {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
499 handle_traversed_entry(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
500 scope,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
501 files_sender,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
502 matcher,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
503 root_dir,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
504 dmap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
505 old_results,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
506 ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
507 dir_ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
508 options,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
509 filename,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
510 dir_entry,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
511 )?;
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
512 }
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
513 }
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
514 Ok(())
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
515 })
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
516 }
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
517
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
518 /// Walk the working directory recursively to look for changes compared to the
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
519 /// current `DirstateMap`.
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
520 ///
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
521 /// This takes a mutable reference to the results to account for the `extend`
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
522 /// in timings
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
523 #[timed]
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
524 fn traverse<'a>(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
525 matcher: &'a (impl Matcher + Sync),
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
526 root_dir: impl AsRef<Path> + Sync + Send + Copy,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
527 dmap: &'a DirstateMap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
528 path: impl AsRef<HgPath>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
529 old_results: &FastHashMap<Cow<'a, HgPath>, Dispatch>,
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
530 ignore_fn: &IgnoreFnType,
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
531 dir_ignore_fn: &IgnoreFnType,
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
532 options: StatusOptions,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
533 results: &mut Vec<(Cow<'a, HgPath>, Dispatch)>,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
534 ) -> IoResult<()> {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
535 let root_dir = root_dir.as_ref();
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
536
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
537 // The traversal is done in parallel, so use a channel to gather entries.
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
538 // `crossbeam::Sender` is `Send`, while `mpsc::Sender` is not.
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
539 let (files_transmitter, files_receiver) = crossbeam::channel::unbounded();
44527
1debb5894b39 rust-status: add function for sequential traversal of the working directory
Raphaël Gomès <rgomes@octobus.net>
parents: 44526
diff changeset
540
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
541 traverse_dir(
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
542 &files_transmitter,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
543 matcher,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
544 root_dir,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
545 &dmap,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
546 path,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
547 &old_results,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
548 &ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
549 &dir_ignore_fn,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
550 options,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
551 )?;
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
552
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
553 // Disconnect the channel so the receiver stops waiting
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
554 drop(files_transmitter);
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
555
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
556 // TODO don't collect. Find a way of replicating the behavior of
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
557 // `itertools::process_results`, but for `rayon::ParallelIterator`
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
558 let new_results: IoResult<Vec<(Cow<'a, HgPath>, Dispatch)>> =
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
559 files_receiver
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
560 .into_iter()
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
561 .map(|item| {
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
562 let (f, d) = item?;
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
563 Ok((Cow::Owned(f), d))
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
564 })
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
565 .collect();
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
566
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
567 results.par_extend(new_results?);
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
568
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
569 Ok(())
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
570 }
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
571
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
572 /// Stat all entries in the `DirstateMap` and mark them for dispatch.
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
573 fn stat_dmap_entries(
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
574 dmap: &DirstateMap,
43603
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
575 root_dir: impl AsRef<Path> + Sync + Send,
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
576 options: StatusOptions,
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
577 ) -> impl ParallelIterator<Item = IoResult<(&HgPath, Dispatch)>> {
43603
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
578 dmap.par_iter().map(move |(filename, entry)| {
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
579 let filename: &HgPath = filename;
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
580 let filename_as_path = hg_path_to_path_buf(filename)?;
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
581 let meta = root_dir.as_ref().join(filename_as_path).symlink_metadata();
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
582
43603
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
583 match meta {
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
584 Ok(ref m)
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
585 if !(m.file_type().is_file()
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
586 || m.file_type().is_symlink()) =>
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
587 {
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
588 Ok((filename, dispatch_missing(entry.state)))
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
589 }
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
590 Ok(m) => Ok((
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
591 filename,
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
592 dispatch_found(
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
593 filename,
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
594 *entry,
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
595 HgMetadata::from_metadata(m),
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
596 &dmap.copy_map,
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
597 options,
43603
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
598 ),
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
599 )),
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
600 Err(ref e)
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
601 if e.kind() == ErrorKind::NotFound
43603
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
602 || e.raw_os_error() == Some(20) =>
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
603 {
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
604 // Rust does not yet have an `ErrorKind` for
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
605 // `NotADirectory` (errno 20)
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
606 // It happens if the dirstate contains `foo/bar` and
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
607 // foo is not a directory
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
608 Ok((filename, dispatch_missing(entry.state)))
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
609 }
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
610 Err(e) => Err(e),
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
611 }
75fe6e71ddb8 rust-status: return a ParallelIterator instead of a Vec from stat_dmap_entries
Raphaël Gomès <rgomes@octobus.net>
parents: 43602
diff changeset
612 })
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
613 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
614
44538
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
615 /// This takes a mutable reference to the results to account for the `extend`
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
616 /// in timings
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
617 #[timed]
44538
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
618 fn extend_from_dmap<'a>(
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
619 dmap: &'a DirstateMap,
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
620 root_dir: impl AsRef<Path> + Sync + Send,
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
621 options: StatusOptions,
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
622 results: &mut Vec<(Cow<'a, HgPath>, Dispatch)>,
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
623 ) {
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
624 results.par_extend(
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
625 stat_dmap_entries(dmap, root_dir, options)
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
626 .flatten()
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
627 .map(|(filename, dispatch)| (Cow::Borrowed(filename), dispatch)),
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
628 );
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
629 }
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
630
44562
ece43c79333e rust-core: add missing `Debug` traits
Raphaël Gomès <rgomes@octobus.net>
parents: 44541
diff changeset
631 #[derive(Debug)]
44525
f13d19549efd rust-status: rename `StatusResult` to `DirstateStatus`
Raphaël Gomès <rgomes@octobus.net>
parents: 44524
diff changeset
632 pub struct DirstateStatus<'a> {
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
633 pub modified: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
634 pub added: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
635 pub removed: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
636 pub deleted: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
637 pub clean: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
638 pub ignored: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
639 pub unknown: Vec<Cow<'a, HgPath>>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
640 pub bad: Vec<(Cow<'a, HgPath>, BadMatch)>,
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
641 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
642
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
643 #[timed]
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
644 fn build_response<'a>(
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
645 results: impl IntoIterator<Item = (Cow<'a, HgPath>, Dispatch)>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
646 ) -> (Vec<Cow<'a, HgPath>>, DirstateStatus<'a>) {
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
647 let mut lookup = vec![];
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
648 let mut modified = vec![];
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
649 let mut added = vec![];
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
650 let mut removed = vec![];
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
651 let mut deleted = vec![];
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
652 let mut clean = vec![];
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
653 let mut ignored = vec![];
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
654 let mut unknown = vec![];
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
655 let mut bad = vec![];
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
656
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
657 for (filename, dispatch) in results.into_iter() {
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
658 match dispatch {
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
659 Dispatch::Unknown => unknown.push(filename),
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
660 Dispatch::Unsure => lookup.push(filename),
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
661 Dispatch::Modified => modified.push(filename),
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
662 Dispatch::Added => added.push(filename),
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
663 Dispatch::Removed => removed.push(filename),
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
664 Dispatch::Deleted => deleted.push(filename),
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
665 Dispatch::Clean => clean.push(filename),
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
666 Dispatch::Ignored => ignored.push(filename),
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
667 Dispatch::None => {}
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
668 Dispatch::Bad(reason) => bad.push((filename, reason)),
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
669 Dispatch::Directory { .. } => {}
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
670 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
671 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
672
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
673 (
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
674 lookup,
44525
f13d19549efd rust-status: rename `StatusResult` to `DirstateStatus`
Raphaël Gomès <rgomes@octobus.net>
parents: 44524
diff changeset
675 DirstateStatus {
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
676 modified,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
677 added,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
678 removed,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
679 deleted,
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
680 clean,
44526
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
681 ignored,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
682 unknown,
61709b844420 rust-status: add missing variants to `Dispatch` enum
Raphaël Gomès <rgomes@octobus.net>
parents: 44525
diff changeset
683 bad,
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
684 },
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
685 )
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
686 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
687
44562
ece43c79333e rust-core: add missing `Debug` traits
Raphaël Gomès <rgomes@octobus.net>
parents: 44541
diff changeset
688 #[derive(Debug)]
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
689 pub enum StatusError {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
690 IO(std::io::Error),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
691 Path(HgPathError),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
692 Pattern(PatternError),
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
693 }
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
694
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
695 pub type StatusResult<T> = Result<T, StatusError>;
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
696
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
697 impl From<PatternError> for StatusError {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
698 fn from(e: PatternError) -> Self {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
699 StatusError::Pattern(e)
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
700 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
701 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
702 impl From<HgPathError> for StatusError {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
703 fn from(e: HgPathError) -> Self {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
704 StatusError::Path(e)
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
705 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
706 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
707 impl From<std::io::Error> for StatusError {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
708 fn from(e: std::io::Error) -> Self {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
709 StatusError::IO(e)
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
710 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
711 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
712
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
713 impl ToString for StatusError {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
714 fn to_string(&self) -> String {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
715 match self {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
716 StatusError::IO(e) => e.to_string(),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
717 StatusError::Path(e) => e.to_string(),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
718 StatusError::Pattern(e) => e.to_string(),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
719 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
720 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
721 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
722
44537
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
723 /// This takes a mutable reference to the results to account for the `extend`
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
724 /// in timings
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
725 #[timed]
44537
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
726 fn handle_unknowns<'a>(
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
727 dmap: &'a DirstateMap,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
728 matcher: &(impl Matcher + Sync),
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
729 root_dir: impl AsRef<Path> + Sync + Send + Copy,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
730 options: StatusOptions,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
731 results: &mut Vec<(Cow<'a, HgPath>, Dispatch)>,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
732 ) -> IoResult<()> {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
733 let to_visit: Vec<(&HgPath, &DirstateEntry)> = if results.is_empty()
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
734 && matcher.matches_everything()
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
735 {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
736 dmap.iter().map(|(f, e)| (f.deref(), e)).collect()
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
737 } else {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
738 // Only convert to a hashmap if needed.
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
739 let old_results: FastHashMap<_, _> = results.iter().cloned().collect();
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
740 dmap.iter()
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
741 .filter_map(move |(f, e)| {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
742 if !old_results.contains_key(f.deref()) && matcher.matches(f) {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
743 Some((f.deref(), e))
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
744 } else {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
745 None
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
746 }
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
747 })
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
748 .collect()
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
749 };
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
750
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
751 // We walked all dirs under the roots that weren't ignored, and
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
752 // everything that matched was stat'ed and is already in results.
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
753 // The rest must thus be ignored or under a symlink.
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
754 let path_auditor = PathAuditor::new(root_dir);
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
755
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
756 // TODO don't collect. Find a way of replicating the behavior of
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
757 // `itertools::process_results`, but for `rayon::ParallelIterator`
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
758 let new_results: IoResult<Vec<_>> = to_visit
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
759 .into_par_iter()
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
760 .filter_map(|(filename, entry)| -> Option<IoResult<_>> {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
761 // Report ignored items in the dmap as long as they are not
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
762 // under a symlink directory.
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
763 if path_auditor.check(filename) {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
764 // TODO normalize for case-insensitive filesystems
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
765 let buf = match hg_path_to_path_buf(filename) {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
766 Ok(x) => x,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
767 Err(e) => return Some(Err(e.into())),
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
768 };
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
769 Some(Ok((
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
770 Cow::Borrowed(filename),
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
771 match root_dir.as_ref().join(&buf).symlink_metadata() {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
772 // File was just ignored, no links, and exists
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
773 Ok(meta) => {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
774 let metadata = HgMetadata::from_metadata(meta);
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
775 dispatch_found(
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
776 filename,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
777 *entry,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
778 metadata,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
779 &dmap.copy_map,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
780 options,
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
781 )
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
782 }
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
783 // File doesn't exist
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
784 Err(_) => dispatch_missing(entry.state),
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
785 },
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
786 )))
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
787 } else {
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
788 // It's either missing or under a symlink directory which
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
789 // we, in this case, report as missing.
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
790 Some(Ok((
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
791 Cow::Borrowed(filename),
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
792 dispatch_missing(entry.state),
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
793 )))
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
794 }
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
795 })
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
796 .collect();
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
797
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
798 results.par_extend(new_results?);
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
799
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
800 Ok(())
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
801 }
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
802
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
803 /// Get the status of files in the working directory.
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
804 ///
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
805 /// This is the current entry-point for `hg-core` and is realistically unusable
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
806 /// outside of a Python context because its arguments need to provide a lot of
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
807 /// information that will not be necessary in the future.
44541
d880805d5442 hg-core: add function timing information
Raphaël Gomès <rgomes@octobus.net>
parents: 44539
diff changeset
808 #[timed]
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
809 pub fn status<'a: 'c, 'b: 'c, 'c>(
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
810 dmap: &'a DirstateMap,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
811 matcher: &'b (impl Matcher + Sync),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
812 root_dir: impl AsRef<Path> + Sync + Send + Copy + 'c,
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
813 ignore_files: Vec<PathBuf>,
44524
483fce658e43 rust-status: refactor options into a `StatusOptions` struct
Raphaël Gomès <rgomes@octobus.net>
parents: 44523
diff changeset
814 options: StatusOptions,
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
815 ) -> StatusResult<(
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
816 (Vec<Cow<'c, HgPath>>, DirstateStatus<'c>),
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
817 Vec<PatternFileWarning>,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
818 )> {
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
819 // Needs to outlive `dir_ignore_fn` since it's captured.
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
820 let mut ignore_fn: IgnoreFnType;
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
821
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
822 // Only involve real ignore mechanism if we're listing unknowns or ignored.
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
823 let (dir_ignore_fn, warnings): (IgnoreFnType, _) = if options.list_ignored
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
824 || options.list_unknown
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
825 {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
826 let (ignore, warnings) = get_ignore_function(ignore_files, root_dir)?;
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
827
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
828 ignore_fn = ignore;
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
829 let dir_ignore_fn = Box::new(|dir: &_| {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
830 // Is the path or one of its ancestors ignored?
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
831 if ignore_fn(dir) {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
832 true
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
833 } else {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
834 for p in find_dirs(dir) {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
835 if ignore_fn(p) {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
836 return true;
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
837 }
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
838 }
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
839 false
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
840 }
44597
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
841 });
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
842 (dir_ignore_fn, warnings)
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
843 } else {
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
844 ignore_fn = Box::new(|&_| true);
e62052d0f377 rust-status: only involve ignore mechanism when needed
Raphaël Gomès <rgomes@octobus.net>
parents: 44562
diff changeset
845 (Box::new(|&_| true), vec![])
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
846 };
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
847
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
848 let files = matcher.file_set();
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
849
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
850 // Step 1: check the files explicitly mentioned by the user
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
851 let explicit = walk_explicit(files, &dmap, root_dir, options);
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
852
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
853 // Collect results into a `Vec` because we do very few lookups in most
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
854 // cases.
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
855 let (work, mut results): (Vec<_>, Vec<_>) = explicit
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
856 .filter_map(Result::ok)
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
857 .map(|(filename, dispatch)| (Cow::Borrowed(filename), dispatch))
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
858 .partition(|(_, dispatch)| match dispatch {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
859 Dispatch::Directory { .. } => true,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
860 _ => false,
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
861 });
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
862
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
863 if !work.is_empty() {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
864 // Hashmaps are quite a bit slower to build than vecs, so only build it
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
865 // if needed.
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
866 let old_results = results.iter().cloned().collect();
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
867
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
868 // Step 2: recursively check the working directory for changes if
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
869 // needed
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
870 for (dir, dispatch) in work {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
871 match dispatch {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
872 Dispatch::Directory { was_file } => {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
873 if was_file {
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
874 results.push((dir.to_owned(), Dispatch::Removed));
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
875 }
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
876 if options.list_ignored
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
877 || options.list_unknown && !dir_ignore_fn(&dir)
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
878 {
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
879 traverse(
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
880 matcher,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
881 root_dir,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
882 &dmap,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
883 &dir,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
884 &old_results,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
885 &ignore_fn,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
886 &dir_ignore_fn,
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
887 options,
44539
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
888 &mut results,
fe7d2cf0b429 rust-status: traverse working directory in parallel
Raphaël Gomès <rgomes@octobus.net>
parents: 44538
diff changeset
889 )?;
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
890 }
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
891 }
44536
f8a9922a02cb rust-status: move to recursive traversal to prepare for parallel traversal
Raphaël Gomès <rgomes@octobus.net>
parents: 44535
diff changeset
892 _ => unreachable!("There can only be directories in `work`"),
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
893 }
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
894 }
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
895 }
43602
889ac87e8bfd rust-status: improve status performance
Raphaël Gomès <rgomes@octobus.net>
parents: 43456
diff changeset
896
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
897 if !matcher.is_exact() {
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
898 // Step 3: Check the remaining files from the dmap.
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
899 // If a dmap file is not in results yet, it was either
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
900 // a) not matched b) ignored, c) missing, or d) under a
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
901 // symlink directory.
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
902
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
903 if options.list_unknown {
44537
5f6a504dc0bd rust-status: refactor handling of unknown files
Raphaël Gomès <rgomes@octobus.net>
parents: 44536
diff changeset
904 handle_unknowns(dmap, matcher, root_dir, options, &mut results)?;
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
905 } else {
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
906 // We may not have walked the full directory tree above, so stat
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
907 // and check everything we missed.
44538
b8ba46c97cdd rust-status: wrap `stat_dmap_entries` to ease profiling
Raphaël Gomès <rgomes@octobus.net>
parents: 44537
diff changeset
908 extend_from_dmap(&dmap, root_dir, options, &mut results);
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
909 }
43915
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
910 }
8c77826116f7 rust-dirstate-status: add `walk_explicit` implementation, use `Matcher` trait
Raphaël Gomès <rgomes@octobus.net>
parents: 43818
diff changeset
911
44528
c8891bca40fb rust-status: add bare `hg status` support in hg-core
Raphaël Gomès <rgomes@octobus.net>
parents: 44527
diff changeset
912 Ok((build_response(results), warnings))
43271
99394e6c5d12 rust-dirstate-status: add first Rust implementation of `dirstate.status`
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
913 }