Mercurial > public > mercurial-scm > hg-stable
annotate rust/hg-core/src/dirstate_tree/status.rs @ 49718:da48f170d203
rust-status: query fs traversal metadata lazily
Currently, any time the status algorithm needs to read a directory from the
filesystem (because the stat-only optimization is not available), it also
stats each directory entry eagerly.
Stat'ing the entries is only needed in a few cases (like when checking
the mtime of a directory for caching): this patch creates a wrapper struct
`DirEntry` that only stats the directory entry it represents when needed.
Excerpt of an `strace` before this change on Mozilla Central:
```
openat(AT_FDCWD, ".", O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_DIRECTORY) = 3
newfstatat(3, "", {st_mode=S_IFDIR|0755, st_size=3540, ...}, AT_EMPTY_PATH) = 0
getdents64(3, 0x55dc970bd440 /* 139 entries */, 32768) = 5072
statx(3, ".hg", AT_STATX_SYNC_AS_STAT|AT_SYMLINK_NOFOLLOW, STATX_ALL, {stx_mask=STATX_ALL|STATX_MNT_ID, stx_attributes=0, stx_mode=S_IFDIR|0755, stx_size=772, ...}) = 0
[... 135 other successful `statx` calls]
getdents64(3, 0x55dc970bd440 /* 0 entries */, 32768) = 0
close(3) = 0
```
After this change:
```
openat(AT_FDCWD, ".", O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_DIRECTORY) = 3
newfstatat(3, "", {st_mode=S_IFDIR|0755, st_size=3540, ...}, AT_EMPTY_PATH) = 0
getdents64(3, 0x561567c10190 /* 139 entries */, 32768) = 5072
getdents64(3, 0x561567c10190 /* 0 entries */, 32768) = 0
close(3) = 0
```
author | Rapha?l Gom?s <rgomes@octobus.net> |
---|---|
date | Wed, 19 Oct 2022 12:38:06 +0200 |
parents | 6b32d39e9a67 |
children | 18282cf18aa2 |
rev | line source |
---|---|
48205
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
1 use crate::dirstate::entry::TruncatedTimestamp; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
2 use crate::dirstate::status::IgnoreFnType; |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
3 use crate::dirstate::status::StatusPath; |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
4 use crate::dirstate_tree::dirstate_map::BorrowedPath; |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
5 use crate::dirstate_tree::dirstate_map::ChildNodesRef; |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
6 use crate::dirstate_tree::dirstate_map::DirstateMap; |
48893
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
7 use crate::dirstate_tree::dirstate_map::DirstateVersion; |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
8 use crate::dirstate_tree::dirstate_map::NodeRef; |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
9 use crate::dirstate_tree::on_disk::DirstateV2ParseError; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
10 use crate::matchers::get_ignore_function; |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
11 use crate::matchers::Matcher; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
12 use crate::utils::files::get_bytes_from_os_string; |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
13 use crate::utils::files::get_path_from_bytes; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
14 use crate::utils::hg_path::HgPath; |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
15 use crate::BadMatch; |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
16 use crate::DirstateStatus; |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
17 use crate::HgPathCow; |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
18 use crate::PatternFileWarning; |
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
19 use crate::StatusError; |
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
20 use crate::StatusOptions; |
47132
c92e63762573
dirstate-tree: Add #[timed] attribute to `status` and `DirstateMap::read`
Simon Sapin <simon.sapin@octobus.net>
parents:
47131
diff
changeset
|
21 use micro_timer::timed; |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
22 use once_cell::sync::OnceCell; |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
23 use rayon::prelude::*; |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
24 use sha1::{Digest, Sha1}; |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
25 use std::borrow::Cow; |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
26 use std::convert::TryFrom; |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
27 use std::convert::TryInto; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
28 use std::io; |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
29 use std::path::Path; |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
30 use std::path::PathBuf; |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
31 use std::sync::Mutex; |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
32 use std::time::SystemTime; |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
33 |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
34 /// Returns the status of the working directory compared to its parent |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
35 /// changeset. |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
36 /// |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
37 /// This algorithm is based on traversing the filesystem tree (`fs` in function |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
38 /// and variable names) and dirstate tree at the same time. The core of this |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
39 /// traversal is the recursive `traverse_fs_directory_and_dirstate` function |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
40 /// and its use of `itertools::merge_join_by`. When reaching a path that only |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
41 /// exists in one of the two trees, depending on information requested by |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
42 /// `options` we may need to traverse the remaining subtree. |
47132
c92e63762573
dirstate-tree: Add #[timed] attribute to `status` and `DirstateMap::read`
Simon Sapin <simon.sapin@octobus.net>
parents:
47131
diff
changeset
|
43 #[timed] |
48825
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48812
diff
changeset
|
44 pub fn status<'dirstate>( |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48812
diff
changeset
|
45 dmap: &'dirstate mut DirstateMap, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
46 matcher: &(dyn Matcher + Sync), |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
47 root_dir: PathBuf, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
48 ignore_files: Vec<PathBuf>, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
49 options: StatusOptions, |
48825
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48812
diff
changeset
|
50 ) -> Result<(DirstateStatus<'dirstate>, Vec<PatternFileWarning>), StatusError> |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48812
diff
changeset
|
51 { |
48812
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
52 // Force the global rayon threadpool to not exceed 16 concurrent threads. |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
53 // This is a stop-gap measure until we figure out why using more than 16 |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
54 // threads makes `status` slower for each additional thread. |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
55 // We use `ok()` in case the global threadpool has already been |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
56 // instantiated in `rhg` or some other caller. |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
57 // TODO find the underlying cause and fix it, then remove this. |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
58 rayon::ThreadPoolBuilder::new() |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
59 .num_threads(16) |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
60 .build_global() |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
61 .ok(); |
e2f8ed37201c
rust-status: cap the number of concurrent threads to 16
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48794
diff
changeset
|
62 |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
63 let (ignore_fn, warnings, patterns_changed): (IgnoreFnType, _, _) = |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
64 if options.list_ignored || options.list_unknown { |
48893
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
65 let (ignore_fn, warnings, changed) = match dmap.dirstate_version { |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
66 DirstateVersion::V1 => { |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
67 let (ignore_fn, warnings) = get_ignore_function( |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
68 ignore_files, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
69 &root_dir, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
70 &mut |_pattern_bytes| {}, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
71 )?; |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
72 (ignore_fn, warnings, None) |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
73 } |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
74 DirstateVersion::V2 => { |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
75 let mut hasher = Sha1::new(); |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
76 let (ignore_fn, warnings) = get_ignore_function( |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
77 ignore_files, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
78 &root_dir, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
79 &mut |pattern_bytes| hasher.update(pattern_bytes), |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
80 )?; |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
81 let new_hash = *hasher.finalize().as_ref(); |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
82 let changed = new_hash != dmap.ignore_patterns_hash; |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
83 dmap.ignore_patterns_hash = new_hash; |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
84 (ignore_fn, warnings, Some(changed)) |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
85 } |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
86 }; |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
87 (ignore_fn, warnings, changed) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
88 } else { |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
89 (Box::new(|&_| true), vec![], None) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
90 }; |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
91 |
48538
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
92 let filesystem_time_at_status_start = |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
93 filesystem_now(&root_dir).ok().map(TruncatedTimestamp::from); |
48750
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
94 |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
95 // If the repository is under the current directory, prefer using a |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
96 // relative path, so the kernel needs to traverse fewer directory in every |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
97 // call to `read_dir` or `symlink_metadata`. |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
98 // This is effective in the common case where the current directory is the |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
99 // repository root. |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
100 |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
101 // TODO: Better yet would be to use libc functions like `openat` and |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
102 // `fstatat` to remove such repeated traversals entirely, but the standard |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
103 // library does not provide APIs based on those. |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
104 // Maybe with a crate like https://crates.io/crates/openat instead? |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
105 let root_dir = if let Some(relative) = std::env::current_dir() |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
106 .ok() |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
107 .and_then(|cwd| root_dir.strip_prefix(cwd).ok()) |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
108 { |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
109 relative |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
110 } else { |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
111 &root_dir |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
112 }; |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
113 |
48468
000130cfafb6
rhg: Update the dirstate on disk after status
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
114 let outcome = DirstateStatus { |
000130cfafb6
rhg: Update the dirstate on disk after status
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
115 filesystem_time_at_status_start, |
000130cfafb6
rhg: Update the dirstate on disk after status
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
116 ..Default::default() |
000130cfafb6
rhg: Update the dirstate on disk after status
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
117 }; |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
118 let common = StatusCommon { |
47344
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
119 dmap, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
120 options, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
121 matcher, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
122 ignore_fn, |
48468
000130cfafb6
rhg: Update the dirstate on disk after status
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
123 outcome: Mutex::new(outcome), |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
124 ignore_patterns_have_changed: patterns_changed, |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
125 new_cachable_directories: Default::default(), |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
126 outated_cached_directories: Default::default(), |
48468
000130cfafb6
rhg: Update the dirstate on disk after status
Simon Sapin <simon.sapin@octobus.net>
parents:
48439
diff
changeset
|
127 filesystem_time_at_status_start, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
128 }; |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
129 let is_at_repo_root = true; |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
130 let hg_path = &BorrowedPath::OnDisk(HgPath::new("")); |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
131 let has_ignored_ancestor = HasIgnoredAncestor::create(None, hg_path); |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
132 let root_cached_mtime = None; |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
133 // If the path we have for the repository root is a symlink, do follow it. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
134 // (As opposed to symlinks within the working directory which are not |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
135 // followed, using `std::fs::symlink_metadata`.) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
136 common.traverse_fs_directory_and_dirstate( |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
137 &has_ignored_ancestor, |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
138 dmap.root.as_ref(), |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
139 hg_path, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
140 &DirEntry { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
141 hg_path: Cow::Borrowed(HgPath::new(b"")), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
142 fs_path: Cow::Borrowed(&root_dir), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
143 symlink_metadata: None, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
144 file_type: FakeFileType::Directory, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
145 }, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
146 root_cached_mtime, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
147 is_at_repo_root, |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
148 )?; |
47356
04d1f17f49e7
dirstate-v2: Write .hg/dirstate back to disk on directory cache changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47355
diff
changeset
|
149 let mut outcome = common.outcome.into_inner().unwrap(); |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
150 let new_cachable = common.new_cachable_directories.into_inner().unwrap(); |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
151 let outdated = common.outated_cached_directories.into_inner().unwrap(); |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
152 |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
153 outcome.dirty = common.ignore_patterns_have_changed == Some(true) |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
154 || !outdated.is_empty() |
48893
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
155 || (!new_cachable.is_empty() |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
156 && dmap.dirstate_version == DirstateVersion::V2); |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
157 |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
158 // Remove outdated mtimes before adding new mtimes, in case a given |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
159 // directory is both |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
160 for path in &outdated { |
49182
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Rapha?l Gom?s <rgomes@octobus.net>
parents:
48825
diff
changeset
|
161 dmap.clear_cached_mtime(path)?; |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
162 } |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
163 for (path, mtime) in &new_cachable { |
49183
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49182
diff
changeset
|
164 dmap.set_cached_mtime(path, *mtime)?; |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
165 } |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
166 |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
167 Ok((outcome, warnings)) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
168 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
169 |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
170 /// Bag of random things needed by various parts of the algorithm. Reduces the |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
171 /// number of parameters passed to functions. |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
172 struct StatusCommon<'a, 'tree, 'on_disk: 'tree> { |
47344
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
173 dmap: &'tree DirstateMap<'on_disk>, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
174 options: StatusOptions, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
175 matcher: &'a (dyn Matcher + Sync), |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
176 ignore_fn: IgnoreFnType<'a>, |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
177 outcome: Mutex<DirstateStatus<'on_disk>>, |
48205
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
178 new_cachable_directories: |
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
179 Mutex<Vec<(Cow<'on_disk, HgPath>, TruncatedTimestamp)>>, |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
180 outated_cached_directories: Mutex<Vec<Cow<'on_disk, HgPath>>>, |
47415
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
181 |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
182 /// Whether ignore files like `.hgignore` have changed since the previous |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
183 /// time a `status()` call wrote their hash to the dirstate. `None` means |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
184 /// we don’t know as this run doesn’t list either ignored or uknown files |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
185 /// and therefore isn’t reading `.hgignore`. |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47356
diff
changeset
|
186 ignore_patterns_have_changed: Option<bool>, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
187 |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
188 /// The current time at the start of the `status()` algorithm, as measured |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
189 /// and possibly truncated by the filesystem. |
48538
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
190 filesystem_time_at_status_start: Option<TruncatedTimestamp>, |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
191 } |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
192 |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
193 enum Outcome { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
194 Modified, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
195 Added, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
196 Removed, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
197 Deleted, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
198 Clean, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
199 Ignored, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
200 Unknown, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
201 Unsure, |
47126
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
202 } |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
203 |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
204 /// Lazy computation of whether a given path has a hgignored |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
205 /// ancestor. |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
206 struct HasIgnoredAncestor<'a> { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
207 /// `path` and `parent` constitute the inputs to the computation, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
208 /// `cache` stores the outcome. |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
209 path: &'a HgPath, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
210 parent: Option<&'a HasIgnoredAncestor<'a>>, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
211 cache: OnceCell<bool>, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
212 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
213 |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
214 impl<'a> HasIgnoredAncestor<'a> { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
215 fn create( |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
216 parent: Option<&'a HasIgnoredAncestor<'a>>, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
217 path: &'a HgPath, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
218 ) -> HasIgnoredAncestor<'a> { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
219 Self { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
220 path, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
221 parent, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
222 cache: OnceCell::new(), |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
223 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
224 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
225 |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
226 fn force<'b>(&self, ignore_fn: &IgnoreFnType<'b>) -> bool { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
227 match self.parent { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
228 None => false, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
229 Some(parent) => { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
230 *(parent.cache.get_or_init(|| { |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
231 parent.force(ignore_fn) || ignore_fn(&self.path) |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
232 })) |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
233 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
234 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
235 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
236 } |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
237 |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
238 impl<'a, 'tree, 'on_disk> StatusCommon<'a, 'tree, 'on_disk> { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
239 fn push_outcome( |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
240 &self, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
241 which: Outcome, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
242 dirstate_node: &NodeRef<'tree, 'on_disk>, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
243 ) -> Result<(), DirstateV2ParseError> { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
244 let path = dirstate_node |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
245 .full_path_borrowed(self.dmap.on_disk)? |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
246 .detach_from_tree(); |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
247 let copy_source = if self.options.list_copies { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
248 dirstate_node |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
249 .copy_source_borrowed(self.dmap.on_disk)? |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
250 .map(|source| source.detach_from_tree()) |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
251 } else { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
252 None |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
253 }; |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
254 self.push_outcome_common(which, path, copy_source); |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
255 Ok(()) |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
256 } |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
257 |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
258 fn push_outcome_without_copy_source( |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
259 &self, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
260 which: Outcome, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
261 path: &BorrowedPath<'_, 'on_disk>, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
262 ) { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
263 self.push_outcome_common(which, path.detach_from_tree(), None) |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
264 } |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
265 |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
266 fn push_outcome_common( |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
267 &self, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
268 which: Outcome, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
269 path: HgPathCow<'on_disk>, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
270 copy_source: Option<HgPathCow<'on_disk>>, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
271 ) { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
272 let mut outcome = self.outcome.lock().unwrap(); |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
273 let vec = match which { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
274 Outcome::Modified => &mut outcome.modified, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
275 Outcome::Added => &mut outcome.added, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
276 Outcome::Removed => &mut outcome.removed, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
277 Outcome::Deleted => &mut outcome.deleted, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
278 Outcome::Clean => &mut outcome.clean, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
279 Outcome::Ignored => &mut outcome.ignored, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
280 Outcome::Unknown => &mut outcome.unknown, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
281 Outcome::Unsure => &mut outcome.unsure, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
282 }; |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
283 vec.push(StatusPath { path, copy_source }); |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
284 } |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
285 |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
286 fn read_dir( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
287 &self, |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
288 hg_path: &HgPath, |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
289 fs_path: &Path, |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
290 is_at_repo_root: bool, |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
291 ) -> Result<Vec<DirEntry>, ()> { |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
292 DirEntry::read_dir(fs_path, is_at_repo_root) |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
293 .map_err(|error| self.io_error(error, hg_path)) |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
294 } |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
295 |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
296 fn io_error(&self, error: std::io::Error, hg_path: &HgPath) { |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
297 let errno = error.raw_os_error().expect("expected real OS error"); |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
298 self.outcome |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
299 .lock() |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
300 .unwrap() |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
301 .bad |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
302 .push((hg_path.to_owned().into(), BadMatch::OsError(errno))) |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
303 } |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
304 |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
305 fn check_for_outdated_directory_cache( |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
306 &self, |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
307 dirstate_node: &NodeRef<'tree, 'on_disk>, |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
308 ) -> Result<(), DirstateV2ParseError> { |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
309 if self.ignore_patterns_have_changed == Some(true) |
48205
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
310 && dirstate_node.cached_directory_mtime()?.is_some() |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
311 { |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
312 self.outated_cached_directories.lock().unwrap().push( |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
313 dirstate_node |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
314 .full_path_borrowed(self.dmap.on_disk)? |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
315 .detach_from_tree(), |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
316 ) |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
317 } |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
318 Ok(()) |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
319 } |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
320 |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
321 /// If this returns true, we can get accurate results by only using |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
322 /// `symlink_metadata` for child nodes that exist in the dirstate and don’t |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
323 /// need to call `read_dir`. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
324 fn can_skip_fs_readdir( |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
325 &self, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
326 directory_entry: &DirEntry, |
48205
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
327 cached_directory_mtime: Option<TruncatedTimestamp>, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
328 ) -> bool { |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
329 if !self.options.list_unknown && !self.options.list_ignored { |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
330 // All states that we care about listing have corresponding |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
331 // dirstate entries. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
332 // This happens for example with `hg status -mard`. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
333 return true; |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
334 } |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
335 if !self.options.list_ignored |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
336 && self.ignore_patterns_have_changed == Some(false) |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
337 { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
338 if let Some(cached_mtime) = cached_directory_mtime { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
339 // The dirstate contains a cached mtime for this directory, set |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
340 // by a previous run of the `status` algorithm which found this |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
341 // directory eligible for `read_dir` caching. |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
342 if let Ok(meta) = directory_entry.symlink_metadata() { |
48230
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
343 if cached_mtime |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
344 .likely_equal_to_mtime_of(&meta) |
48230
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
345 .unwrap_or(false) |
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
346 { |
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
347 // The mtime of that directory has not changed |
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
348 // since then, which means that the results of |
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
349 // `read_dir` should also be unchanged. |
15dedc0c5c35
status: Extract TruncatedTimestamp from fs::Metadata without SystemTime
Simon Sapin <simon.sapin@octobus.net>
parents:
48205
diff
changeset
|
350 return true; |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
351 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
352 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
353 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
354 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
355 false |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
356 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
357 |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
358 /// Returns whether all child entries of the filesystem directory have a |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
359 /// corresponding dirstate node or are ignored. |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
360 fn traverse_fs_directory_and_dirstate<'ancestor>( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
361 &self, |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
362 has_ignored_ancestor: &'ancestor HasIgnoredAncestor<'ancestor>, |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
363 dirstate_nodes: ChildNodesRef<'tree, 'on_disk>, |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
364 directory_hg_path: &BorrowedPath<'tree, 'on_disk>, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
365 directory_entry: &DirEntry, |
48205
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
366 cached_directory_mtime: Option<TruncatedTimestamp>, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
367 is_at_repo_root: bool, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
368 ) -> Result<bool, DirstateV2ParseError> { |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
369 if self.can_skip_fs_readdir(directory_entry, cached_directory_mtime) { |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
370 dirstate_nodes |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
371 .par_iter() |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
372 .map(|dirstate_node| { |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
373 let fs_path = &directory_entry.fs_path; |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
374 let fs_path = fs_path.join(get_path_from_bytes( |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
375 dirstate_node.base_name(self.dmap.on_disk)?.as_bytes(), |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
376 )); |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
377 match std::fs::symlink_metadata(&fs_path) { |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
378 Ok(fs_metadata) => { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
379 let file_type = |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
380 match fs_metadata.file_type().try_into() { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
381 Ok(file_type) => file_type, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
382 Err(_) => return Ok(()), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
383 }; |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
384 let entry = DirEntry { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
385 hg_path: Cow::Borrowed( |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
386 dirstate_node |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
387 .full_path(&self.dmap.on_disk)?, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
388 ), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
389 fs_path: Cow::Borrowed(&fs_path), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
390 symlink_metadata: Some(fs_metadata), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
391 file_type, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
392 }; |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
393 self.traverse_fs_and_dirstate( |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
394 &entry, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
395 dirstate_node, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
396 has_ignored_ancestor, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
397 ) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
398 } |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
399 Err(e) if e.kind() == std::io::ErrorKind::NotFound => { |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
400 self.traverse_dirstate_only(dirstate_node) |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
401 } |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
402 Err(error) => { |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
403 let hg_path = |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
404 dirstate_node.full_path(self.dmap.on_disk)?; |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
405 Ok(self.io_error(error, hg_path)) |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
406 } |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
407 } |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
408 }) |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
409 .collect::<Result<_, _>>()?; |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
410 |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
411 // We don’t know, so conservatively say this isn’t the case |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
412 let children_all_have_dirstate_node_or_are_ignored = false; |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
413 |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
414 return Ok(children_all_have_dirstate_node_or_are_ignored); |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
415 } |
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
416 |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
417 let mut fs_entries = if let Ok(entries) = self.read_dir( |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
418 directory_hg_path, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
419 &directory_entry.fs_path, |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
420 is_at_repo_root, |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
421 ) { |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
422 entries |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
423 } else { |
47352
5e12b6bfdd3e
dirstate-tree: Fix status algorithm with unreadable directory
Simon Sapin <simon.sapin@octobus.net>
parents:
47346
diff
changeset
|
424 // Treat an unreadable directory (typically because of insufficient |
5e12b6bfdd3e
dirstate-tree: Fix status algorithm with unreadable directory
Simon Sapin <simon.sapin@octobus.net>
parents:
47346
diff
changeset
|
425 // permissions) like an empty directory. `self.read_dir` has |
5e12b6bfdd3e
dirstate-tree: Fix status algorithm with unreadable directory
Simon Sapin <simon.sapin@octobus.net>
parents:
47346
diff
changeset
|
426 // already called `self.io_error` so a warning will be emitted. |
5e12b6bfdd3e
dirstate-tree: Fix status algorithm with unreadable directory
Simon Sapin <simon.sapin@octobus.net>
parents:
47346
diff
changeset
|
427 Vec::new() |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
428 }; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
429 |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
430 // `merge_join_by` requires both its input iterators to be sorted: |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
431 |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
432 let dirstate_nodes = dirstate_nodes.sorted(); |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
433 // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
434 // https://github.com/rust-lang/rust/issues/34162 |
49717
6b32d39e9a67
rust-status: make `DirEntry` attributes clearer
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49524
diff
changeset
|
435 fs_entries.sort_unstable_by(|e1, e2| e1.hg_path.cmp(&e2.hg_path)); |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
436 |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
437 // Propagate here any error that would happen inside the comparison |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
438 // callback below |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
439 for dirstate_node in &dirstate_nodes { |
47344
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
440 dirstate_node.base_name(self.dmap.on_disk)?; |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
441 } |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
442 itertools::merge_join_by( |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
443 dirstate_nodes, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
444 &fs_entries, |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
445 |dirstate_node, fs_entry| { |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
446 // This `unwrap` never panics because we already propagated |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
447 // those errors above |
47344
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
448 dirstate_node |
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
449 .base_name(self.dmap.on_disk) |
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
450 .unwrap() |
49717
6b32d39e9a67
rust-status: make `DirEntry` attributes clearer
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49524
diff
changeset
|
451 .cmp(&fs_entry.hg_path) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
452 }, |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
453 ) |
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
454 .par_bridge() |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
455 .map(|pair| { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
456 use itertools::EitherOrBoth::*; |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
457 let has_dirstate_node_or_is_ignored; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
458 match pair { |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
459 Both(dirstate_node, fs_entry) => { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
460 self.traverse_fs_and_dirstate( |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
461 &fs_entry, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
462 dirstate_node, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
463 has_ignored_ancestor, |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
464 )?; |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
465 has_dirstate_node_or_is_ignored = true |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
466 } |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
467 Left(dirstate_node) => { |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
468 self.traverse_dirstate_only(dirstate_node)?; |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
469 has_dirstate_node_or_is_ignored = true; |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
470 } |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
471 Right(fs_entry) => { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
472 has_dirstate_node_or_is_ignored = self.traverse_fs_only( |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
473 has_ignored_ancestor.force(&self.ignore_fn), |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
474 directory_hg_path, |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
475 fs_entry, |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
476 ) |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
477 } |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
478 } |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
479 Ok(has_dirstate_node_or_is_ignored) |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
480 }) |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
481 .try_reduce(|| true, |a, b| Ok(a && b)) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
482 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
483 |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
484 fn traverse_fs_and_dirstate<'ancestor>( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
485 &self, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
486 fs_entry: &DirEntry, |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
487 dirstate_node: NodeRef<'tree, 'on_disk>, |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
488 has_ignored_ancestor: &'ancestor HasIgnoredAncestor<'ancestor>, |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
489 ) -> Result<(), DirstateV2ParseError> { |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
490 self.check_for_outdated_directory_cache(&dirstate_node)?; |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
491 let hg_path = &dirstate_node.full_path_borrowed(self.dmap.on_disk)?; |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
492 let file_or_symlink = fs_entry.is_file() || fs_entry.is_symlink(); |
47128
aeb03758f37a
dirstate-tree: Ignore FIFOs etc. in the status algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47127
diff
changeset
|
493 if !file_or_symlink { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
494 // If we previously had a file here, it was removed (with |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
495 // `hg rm` or similar) or deleted before it could be |
47128
aeb03758f37a
dirstate-tree: Ignore FIFOs etc. in the status algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47127
diff
changeset
|
496 // replaced by a directory or something else. |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
497 self.mark_removed_or_deleted_if_file(&dirstate_node)?; |
47128
aeb03758f37a
dirstate-tree: Ignore FIFOs etc. in the status algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47127
diff
changeset
|
498 } |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
499 if fs_entry.is_dir() { |
47128
aeb03758f37a
dirstate-tree: Ignore FIFOs etc. in the status algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47127
diff
changeset
|
500 if self.options.collect_traversed_dirs { |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
501 self.outcome |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
502 .lock() |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
503 .unwrap() |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
504 .traversed |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
505 .push(hg_path.detach_from_tree()) |
47128
aeb03758f37a
dirstate-tree: Ignore FIFOs etc. in the status algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47127
diff
changeset
|
506 } |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
507 let is_ignored = HasIgnoredAncestor::create( |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
508 Some(&has_ignored_ancestor), |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
509 hg_path, |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
510 ); |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
511 let is_at_repo_root = false; |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
512 let children_all_have_dirstate_node_or_are_ignored = self |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
513 .traverse_fs_directory_and_dirstate( |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
514 &is_ignored, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
515 dirstate_node.children(self.dmap.on_disk)?, |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
516 hg_path, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
517 fs_entry, |
48205
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48204
diff
changeset
|
518 dirstate_node.cached_directory_mtime()?, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
519 is_at_repo_root, |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
520 )?; |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
521 self.maybe_save_directory_mtime( |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
522 children_all_have_dirstate_node_or_are_ignored, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
523 fs_entry, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
524 dirstate_node, |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
525 )? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
526 } else { |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
527 if file_or_symlink && self.matcher.matches(&hg_path) { |
49197
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
528 if let Some(entry) = dirstate_node.entry()? { |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
529 if !entry.any_tracked() { |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
530 // Forward-compat if we start tracking unknown/ignored |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
531 // files for caching reasons |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
532 self.mark_unknown_or_ignored( |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
533 has_ignored_ancestor.force(&self.ignore_fn), |
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
534 &hg_path, |
49197
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
535 ); |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
536 } |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
537 if entry.added() { |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
538 self.push_outcome(Outcome::Added, &dirstate_node)?; |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
539 } else if entry.removed() { |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
540 self.push_outcome(Outcome::Removed, &dirstate_node)?; |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
541 } else if entry.modified() { |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
542 self.push_outcome(Outcome::Modified, &dirstate_node)?; |
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
543 } else { |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
544 self.handle_normal_file(&dirstate_node, fs_entry)?; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
545 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
546 } else { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
547 // `node.entry.is_none()` indicates a "directory" |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
548 // node, but the filesystem has a file |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
549 self.mark_unknown_or_ignored( |
49524
eb02decdf0ab
dirstate-v2: skip evaluation of hgignore regex on cached directories
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
49400
diff
changeset
|
550 has_ignored_ancestor.force(&self.ignore_fn), |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
551 hg_path, |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
552 ); |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
553 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
554 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
555 |
47344
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
556 for child_node in dirstate_node.children(self.dmap.on_disk)?.iter() |
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
557 { |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
558 self.traverse_dirstate_only(child_node)? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
559 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
560 } |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
561 Ok(()) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
562 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
563 |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
564 fn maybe_save_directory_mtime( |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
565 &self, |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
566 children_all_have_dirstate_node_or_are_ignored: bool, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
567 directory_entry: &DirEntry, |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
568 dirstate_node: NodeRef<'tree, 'on_disk>, |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
569 ) -> Result<(), DirstateV2ParseError> { |
48538
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
570 if !children_all_have_dirstate_node_or_are_ignored { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
571 return Ok(()); |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
572 } |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
573 // All filesystem directory entries from `read_dir` have a |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
574 // corresponding node in the dirstate, so we can reconstitute the |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
575 // names of those entries without calling `read_dir` again. |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
576 |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
577 // TODO: use let-else here and below when available: |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
578 // https://github.com/rust-lang/rust/issues/87335 |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
579 let status_start = if let Some(status_start) = |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
580 &self.filesystem_time_at_status_start |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
581 { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
582 status_start |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
583 } else { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
584 return Ok(()); |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
585 }; |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
586 |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
587 // Although the Rust standard library’s `SystemTime` type |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
588 // has nanosecond precision, the times reported for a |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
589 // directory’s (or file’s) modified time may have lower |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
590 // resolution based on the filesystem (for example ext3 |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
591 // only stores integer seconds), kernel (see |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
592 // https://stackoverflow.com/a/14393315/1162888), etc. |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
593 let metadata = match directory_entry.symlink_metadata() { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
594 Ok(meta) => meta, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
595 Err(_) => return Ok(()), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
596 }; |
48538
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
597 let directory_mtime = if let Ok(option) = |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
598 TruncatedTimestamp::for_reliable_mtime_of(&metadata, status_start) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
599 { |
48538
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
600 if let Some(directory_mtime) = option { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
601 directory_mtime |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
602 } else { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
603 // The directory was modified too recently, |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
604 // don’t cache its `read_dir` results. |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
605 // |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
606 // 1. A change to this directory (direct child was |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
607 // added or removed) cause its mtime to be set |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
608 // (possibly truncated) to `directory_mtime` |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
609 // 2. This `status` algorithm calls `read_dir` |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
610 // 3. An other change is made to the same directory is |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
611 // made so that calling `read_dir` agin would give |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
612 // different results, but soon enough after 1. that |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
613 // the mtime stays the same |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
614 // |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
615 // On a system where the time resolution poor, this |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
616 // scenario is not unlikely if all three steps are caused |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
617 // by the same script. |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
618 return Ok(()); |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
619 } |
48538
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
620 } else { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
621 // OS/libc does not support mtime? |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
622 return Ok(()); |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
623 }; |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
624 // We’ve observed (through `status_start`) that time has |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
625 // “progressed” since `directory_mtime`, so any further |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
626 // change to this directory is extremely likely to cause a |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
627 // different mtime. |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
628 // |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
629 // Having the same mtime again is not entirely impossible |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
630 // since the system clock is not monotonous. It could jump |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
631 // backward to some point before `directory_mtime`, then a |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
632 // directory change could potentially happen during exactly |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
633 // the wrong tick. |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
634 // |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
635 // We deem this scenario (unlike the previous one) to be |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
636 // unlikely enough in practice. |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
637 |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
638 let is_up_to_date = |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
639 if let Some(cached) = dirstate_node.cached_directory_mtime()? { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
640 cached.likely_equal(directory_mtime) |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
641 } else { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
642 false |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
643 }; |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
644 if !is_up_to_date { |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
645 let hg_path = dirstate_node |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
646 .full_path_borrowed(self.dmap.on_disk)? |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
647 .detach_from_tree(); |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
648 self.new_cachable_directories |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
649 .lock() |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
650 .unwrap() |
4afb9627dc77
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net>
parents:
48493
diff
changeset
|
651 .push((hg_path, directory_mtime)) |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
652 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
653 Ok(()) |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
654 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
655 |
49197
c4ccd0346f5c
rust-status: stop using `state()` in the dispatch logic
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49196
diff
changeset
|
656 /// A file that is clean in the dirstate was found in the filesystem |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
657 fn handle_normal_file( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
658 &self, |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
659 dirstate_node: &NodeRef<'tree, 'on_disk>, |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
660 fs_entry: &DirEntry, |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
661 ) -> Result<(), DirstateV2ParseError> { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
662 // Keep the low 31 bits |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
663 fn truncate_u64(value: u64) -> i32 { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
664 (value & 0x7FFF_FFFF) as i32 |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
665 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
666 |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
667 let fs_metadata = match fs_entry.symlink_metadata() { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
668 Ok(meta) => meta, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
669 Err(_) => return Ok(()), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
670 }; |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
671 |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
672 let entry = dirstate_node |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
673 .entry()? |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
674 .expect("handle_normal_file called with entry-less node"); |
47346
f27f2afb15da
dirstate-tree: Skip readdir() in `hg status -mard`
Simon Sapin <simon.sapin@octobus.net>
parents:
47344
diff
changeset
|
675 let mode_changed = |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
676 || self.options.check_exec && entry.mode_changed(&fs_metadata); |
48044
f2a9db29cb2d
rust: Make the fields of DirstateEntry private
Simon Sapin <simon.sapin@octobus.net>
parents:
47480
diff
changeset
|
677 let size = entry.size(); |
f2a9db29cb2d
rust: Make the fields of DirstateEntry private
Simon Sapin <simon.sapin@octobus.net>
parents:
47480
diff
changeset
|
678 let size_changed = size != truncate_u64(fs_metadata.len()); |
f2a9db29cb2d
rust: Make the fields of DirstateEntry private
Simon Sapin <simon.sapin@octobus.net>
parents:
47480
diff
changeset
|
679 if size >= 0 && size_changed && fs_metadata.file_type().is_symlink() { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
680 // issue6456: Size returned may be longer due to encryption |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
681 // on EXT-4 fscrypt. TODO maybe only do it on EXT4? |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
682 self.push_outcome(Outcome::Unsure, dirstate_node)? |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
683 } else if dirstate_node.has_copy_source() |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
684 || entry.is_from_other_parent() |
48044
f2a9db29cb2d
rust: Make the fields of DirstateEntry private
Simon Sapin <simon.sapin@octobus.net>
parents:
47480
diff
changeset
|
685 || (size >= 0 && (size_changed || mode_changed())) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
686 { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
687 self.push_outcome(Outcome::Modified, dirstate_node)? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
688 } else { |
48271
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
689 let mtime_looks_clean; |
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
690 if let Some(dirstate_mtime) = entry.truncated_mtime() { |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
691 let fs_mtime = TruncatedTimestamp::for_mtime_of(&fs_metadata) |
48274
83d0bd45b662
dirstate-v2: actually use sub-second mtime precision
Simon Sapin <simon.sapin@octobus.net>
parents:
48271
diff
changeset
|
692 .expect("OS/libc does not support mtime?"); |
48439
b80e5e75d51e
dirstate: remove `lastnormaltime` mechanism
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48274
diff
changeset
|
693 // There might be a change in the future if for example the |
b80e5e75d51e
dirstate: remove `lastnormaltime` mechanism
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48274
diff
changeset
|
694 // internal clock become off while process run, but this is a |
b80e5e75d51e
dirstate: remove `lastnormaltime` mechanism
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48274
diff
changeset
|
695 // case where the issues the user would face |
b80e5e75d51e
dirstate: remove `lastnormaltime` mechanism
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48274
diff
changeset
|
696 // would be a lot worse and there is nothing we |
b80e5e75d51e
dirstate: remove `lastnormaltime` mechanism
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48274
diff
changeset
|
697 // can really do. |
48271
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
698 mtime_looks_clean = fs_mtime.likely_equal(dirstate_mtime) |
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
699 } else { |
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
700 // No mtime in the dirstate entry |
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
701 mtime_looks_clean = false |
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
702 }; |
269ff8978086
dirstate: store mtimes with nanosecond precision in memory
Simon Sapin <simon.sapin@octobus.net>
parents:
48268
diff
changeset
|
703 if !mtime_looks_clean { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
704 self.push_outcome(Outcome::Unsure, dirstate_node)? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
705 } else if self.options.list_clean { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
706 self.push_outcome(Outcome::Clean, dirstate_node)? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
707 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
708 } |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
709 Ok(()) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
710 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
711 |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
712 /// A node in the dirstate tree has no corresponding filesystem entry |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
713 fn traverse_dirstate_only( |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
714 &self, |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
715 dirstate_node: NodeRef<'tree, 'on_disk>, |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
716 ) -> Result<(), DirstateV2ParseError> { |
47479
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47415
diff
changeset
|
717 self.check_for_outdated_directory_cache(&dirstate_node)?; |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
718 self.mark_removed_or_deleted_if_file(&dirstate_node)?; |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
719 dirstate_node |
47344
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47343
diff
changeset
|
720 .children(self.dmap.on_disk)? |
47341
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47339
diff
changeset
|
721 .par_iter() |
47343
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
722 .map(|child_node| self.traverse_dirstate_only(child_node)) |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47341
diff
changeset
|
723 .collect() |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
724 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
725 |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
726 /// A node in the dirstate tree has no corresponding *file* on the |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
727 /// filesystem |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
728 /// |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
729 /// Does nothing on a "directory" node |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
730 fn mark_removed_or_deleted_if_file( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
731 &self, |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
732 dirstate_node: &NodeRef<'tree, 'on_disk>, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
733 ) -> Result<(), DirstateV2ParseError> { |
49196
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
734 if let Some(entry) = dirstate_node.entry()? { |
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
735 if !entry.any_tracked() { |
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
736 // Future-compat for when we start storing ignored and unknown |
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
737 // files for caching reasons |
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
738 return Ok(()); |
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
739 } |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
740 let path = dirstate_node.full_path(self.dmap.on_disk)?; |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
741 if self.matcher.matches(path) { |
49196
126d253eb274
rust-status: stop using `state()` in `handle_normal_file`
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49183
diff
changeset
|
742 if entry.removed() { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
743 self.push_outcome(Outcome::Removed, dirstate_node)? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
744 } else { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
745 self.push_outcome(Outcome::Deleted, &dirstate_node)? |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
746 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
747 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
748 } |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
749 Ok(()) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
750 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
751 |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
752 /// Something in the filesystem has no corresponding dirstate node |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
753 /// |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
754 /// Returns whether that path is ignored |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
755 fn traverse_fs_only( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
756 &self, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
757 has_ignored_ancestor: bool, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
758 directory_hg_path: &HgPath, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
759 fs_entry: &DirEntry, |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
760 ) -> bool { |
49717
6b32d39e9a67
rust-status: make `DirEntry` attributes clearer
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49524
diff
changeset
|
761 let hg_path = directory_hg_path.join(&fs_entry.hg_path); |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
762 let file_or_symlink = fs_entry.is_file() || fs_entry.is_symlink(); |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
763 if fs_entry.is_dir() { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
764 let is_ignored = |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
765 has_ignored_ancestor || (self.ignore_fn)(&hg_path); |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
766 let traverse_children = if is_ignored { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
767 // Descendants of an ignored directory are all ignored |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
768 self.options.list_ignored |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
769 } else { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
770 // Descendants of an unknown directory may be either unknown or |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
771 // ignored |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
772 self.options.list_unknown || self.options.list_ignored |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
773 }; |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
774 if traverse_children { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
775 let is_at_repo_root = false; |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
776 if let Ok(children_fs_entries) = |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
777 self.read_dir(&hg_path, &fs_entry.fs_path, is_at_repo_root) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
778 { |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
779 children_fs_entries.par_iter().for_each(|child_fs_entry| { |
47129
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
780 self.traverse_fs_only( |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
781 is_ignored, |
1b4f0f819f92
dirstate-tree: Handle I/O errors in status
Simon Sapin <simon.sapin@octobus.net>
parents:
47128
diff
changeset
|
782 &hg_path, |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
783 child_fs_entry, |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
784 ); |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
785 }) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
786 } |
49400
7e5377bdb66e
rust-status: ignored directories are now correctly only listed if opted into
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49365
diff
changeset
|
787 if self.options.collect_traversed_dirs { |
7e5377bdb66e
rust-status: ignored directories are now correctly only listed if opted into
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49365
diff
changeset
|
788 self.outcome.lock().unwrap().traversed.push(hg_path.into()) |
7e5377bdb66e
rust-status: ignored directories are now correctly only listed if opted into
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49365
diff
changeset
|
789 } |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
790 } |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
791 is_ignored |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
792 } else { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
793 if file_or_symlink { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
794 if self.matcher.matches(&hg_path) { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
795 self.mark_unknown_or_ignored( |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
796 has_ignored_ancestor, |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
797 &BorrowedPath::InMemory(&hg_path), |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
798 ) |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
799 } else { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
800 // We haven’t computed whether this path is ignored. It |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
801 // might not be, and a future run of status might have a |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
802 // different matcher that matches it. So treat it as not |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
803 // ignored. That is, inhibit readdir caching of the parent |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
804 // directory. |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
805 false |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
806 } |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
807 } else { |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
808 // This is neither a directory, a plain file, or a symlink. |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
809 // Treat it like an ignored file. |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
810 true |
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
811 } |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
812 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
813 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
814 |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
815 /// Returns whether that path is ignored |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
816 fn mark_unknown_or_ignored( |
47131
60d852ae7e7b
dirstate-tree: Paralellize the status algorithm with Rayon
Simon Sapin <simon.sapin@octobus.net>
parents:
47129
diff
changeset
|
817 &self, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
818 has_ignored_ancestor: bool, |
47353
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
819 hg_path: &BorrowedPath<'_, 'on_disk>, |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
820 ) -> bool { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
821 let is_ignored = has_ignored_ancestor || (self.ignore_fn)(&hg_path); |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
822 if is_ignored { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
823 if self.options.list_ignored { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
824 self.push_outcome_without_copy_source( |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
825 Outcome::Ignored, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
826 hg_path, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
827 ) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
828 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
829 } else { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
830 if self.options.list_unknown { |
48493
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
831 self.push_outcome_without_copy_source( |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
832 Outcome::Unknown, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
833 hg_path, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48468
diff
changeset
|
834 ) |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
835 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
836 } |
47480
94e38822d395
status: Extend read_dir caching to directories with ignored files
Simon Sapin <simon.sapin@octobus.net>
parents:
47479
diff
changeset
|
837 is_ignored |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
838 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
839 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
840 |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
841 /// Since [`std::fs::FileType`] cannot be built directly, we emulate what we |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
842 /// care about. |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
843 #[derive(Copy, Clone, Debug, PartialEq, Eq)] |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
844 enum FakeFileType { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
845 File, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
846 Directory, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
847 Symlink, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
848 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
849 |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
850 impl TryFrom<std::fs::FileType> for FakeFileType { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
851 type Error = (); |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
852 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
853 fn try_from(f: std::fs::FileType) -> Result<Self, Self::Error> { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
854 if f.is_dir() { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
855 Ok(Self::Directory) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
856 } else if f.is_file() { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
857 Ok(Self::File) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
858 } else if f.is_symlink() { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
859 Ok(Self::Symlink) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
860 } else { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
861 // Things like FIFO etc. |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
862 Err(()) |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
863 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
864 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
865 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
866 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
867 struct DirEntry<'a> { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
868 /// Path as stored in the dirstate, or just the filename for optimization. |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
869 hg_path: HgPathCow<'a>, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
870 /// Filesystem path |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
871 fs_path: Cow<'a, Path>, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
872 /// Lazily computed |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
873 symlink_metadata: Option<std::fs::Metadata>, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
874 /// Already computed for ergonomics. |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
875 file_type: FakeFileType, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
876 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
877 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
878 impl<'a> DirEntry<'a> { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
879 /// Returns **unsorted** entries in the given directory, with name, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
880 /// metadata and file type. |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
881 /// |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
882 /// If a `.hg` sub-directory is encountered: |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
883 /// |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
884 /// * At the repository root, ignore that sub-directory |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
885 /// * Elsewhere, we’re listing the content of a sub-repo. Return an empty |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
886 /// list instead. |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
887 fn read_dir(path: &Path, is_at_repo_root: bool) -> io::Result<Vec<Self>> { |
48750
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
888 // `read_dir` returns a "not found" error for the empty path |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
889 let at_cwd = path == Path::new(""); |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
890 let read_dir_path = if at_cwd { Path::new(".") } else { path }; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
891 let mut results = Vec::new(); |
48750
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
892 for entry in read_dir_path.read_dir()? { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
893 let entry = entry?; |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
894 let file_type = match entry.file_type() { |
48378
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
895 Ok(v) => v, |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
896 Err(e) => { |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
897 // race with file deletion? |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
898 if e.kind() == std::io::ErrorKind::NotFound { |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
899 continue; |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
900 } else { |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
901 return Err(e); |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
902 } |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
903 } |
dcec16e799dd
status: fix hg status race against file deletion
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48274
diff
changeset
|
904 }; |
48750
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
905 let file_name = entry.file_name(); |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
906 // FIXME don't do this when cached |
48750
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
907 if file_name == ".hg" { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
908 if is_at_repo_root { |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
909 // Skip the repo’s own .hg (might be a symlink) |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
910 continue; |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
911 } else if file_type.is_dir() { |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
912 // A .hg sub-directory at another location means a subrepo, |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
913 // skip it entirely. |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
914 return Ok(Vec::new()); |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
915 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
916 } |
48750
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
917 let full_path = if at_cwd { |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
918 file_name.clone().into() |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
919 } else { |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
920 entry.path() |
94e36b230990
status: prefer relative paths in Rust code
Simon Sapin <simon.sapin@octobus.net>
parents:
48538
diff
changeset
|
921 }; |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
922 let filename = |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
923 Cow::Owned(get_bytes_from_os_string(file_name).into()); |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
924 let file_type = match FakeFileType::try_from(file_type) { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
925 Ok(file_type) => file_type, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
926 Err(_) => continue, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
927 }; |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
928 results.push(DirEntry { |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
929 hg_path: filename, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
930 fs_path: Cow::Owned(full_path.to_path_buf()), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
931 symlink_metadata: None, |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
932 file_type, |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
933 }) |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
934 } |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
935 Ok(results) |
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
936 } |
49718
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
937 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
938 fn symlink_metadata(&self) -> Result<std::fs::Metadata, std::io::Error> { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
939 match &self.symlink_metadata { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
940 Some(meta) => Ok(meta.clone()), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
941 None => std::fs::symlink_metadata(&self.fs_path), |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
942 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
943 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
944 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
945 fn is_dir(&self) -> bool { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
946 self.file_type == FakeFileType::Directory |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
947 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
948 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
949 fn is_file(&self) -> bool { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
950 self.file_type == FakeFileType::File |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
951 } |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
952 |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
953 fn is_symlink(&self) -> bool { |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
954 self.file_type == FakeFileType::Symlink |
da48f170d203
rust-status: query fs traversal metadata lazily
Rapha?l Gom?s <rgomes@octobus.net>
parents:
49717
diff
changeset
|
955 } |
47127
be579775c2d9
dirstate-tree: Add the new `status()` algorithm
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
956 } |
47355
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
957 |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
958 /// Return the `mtime` of a temporary file newly-created in the `.hg` directory |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
959 /// of the give repository. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
960 /// |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
961 /// This is similar to `SystemTime::now()`, with the result truncated to the |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
962 /// same time resolution as other files’ modification times. Using `.hg` |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
963 /// instead of the system’s default temporary directory (such as `/tmp`) makes |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
964 /// it more likely the temporary file is in the same disk partition as contents |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
965 /// of the working directory, which can matter since different filesystems may |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
966 /// store timestamps with different resolutions. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
967 /// |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
968 /// This may fail, typically if we lack write permissions. In that case we |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
969 /// should continue the `status()` algoritm anyway and consider the current |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
970 /// date/time to be unknown. |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
971 fn filesystem_now(repo_root: &Path) -> Result<SystemTime, io::Error> { |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
972 tempfile::tempfile_in(repo_root.join(".hg"))? |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
973 .metadata()? |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
974 .modified() |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47353
diff
changeset
|
975 } |