Mercurial > hg
annotate rust/hg-core/src/dirstate_tree/dirstate_map.rs @ 50863:264072107105
rust-status: error on non-existent files in file_set
file_set here consists of the files that were explicitly specified on
the command line. Erroring on them matches the behavior of Python
status.
author | Spencer Baugh <sbaugh@janestreet.com> |
---|---|
date | Wed, 02 Aug 2023 10:21:18 -0400 |
parents | a10d823a8e3d |
children | 532e74ad3ff6 |
rev | line source |
---|---|
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1 use bytes_cast::BytesCast; |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
2 use std::borrow::Cow; |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
3 use std::path::PathBuf; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
4 |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
5 use super::on_disk; |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
6 use super::on_disk::DirstateV2ParseError; |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
7 use super::owning::OwningDirstateMap; |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
8 use super::path_with_basename::WithBasename; |
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
9 use crate::dirstate::parsers::pack_entry; |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
10 use crate::dirstate::parsers::packed_entry_size; |
47098
d7631d55da3e
dirstate-tree: Add parsing only dirstate parents from disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47097
diff
changeset
|
11 use crate::dirstate::parsers::parse_dirstate_entries; |
48068
bf8837e3d7ce
dirstate: Remove the flat Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
48061
diff
changeset
|
12 use crate::dirstate::CopyMapIter; |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
13 use crate::dirstate::DirstateV2Data; |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
14 use crate::dirstate::ParentFileData; |
48068
bf8837e3d7ce
dirstate: Remove the flat Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
48061
diff
changeset
|
15 use crate::dirstate::StateMapIter; |
48193
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
16 use crate::dirstate::TruncatedTimestamp; |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
17 use crate::matchers::Matcher; |
49979
f5b168979626
rust: move `filter_map_results` to public util
Raphaël Gomès <rgomes@octobus.net>
parents:
49930
diff
changeset
|
18 use crate::utils::filter_map_results; |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
19 use crate::utils::hg_path::{HgPath, HgPathBuf}; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
20 use crate::DirstateEntry; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
21 use crate::DirstateError; |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
22 use crate::DirstateMapError; |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
23 use crate::DirstateParents; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
24 use crate::DirstateStatus; |
48950
11c0411bf4e2
dirstate-tree: optimize HashMap lookups with raw_entry_mut
Simon Sapin <simon.sapin@octobus.net>
parents:
48454
diff
changeset
|
25 use crate::FastHashbrownMap as FastHashMap; |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
26 use crate::PatternFileWarning; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
27 use crate::StatusError; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
28 use crate::StatusOptions; |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
29 |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
30 /// Append to an existing data file if the amount of unreachable data (not used |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
31 /// anymore) is less than this fraction of the total amount of existing data. |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
32 const ACCEPTABLE_UNREACHABLE_BYTES_RATIO: f32 = 0.5; |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
33 |
49337
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
34 #[derive(Debug, PartialEq, Eq)] |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
35 /// Version of the on-disk format |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
36 pub enum DirstateVersion { |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
37 V1, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
38 V2, |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
39 } |
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
40 |
50221
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
41 #[derive(Debug, PartialEq, Eq)] |
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
42 pub enum DirstateMapWriteMode { |
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
43 Auto, |
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
44 ForceNewDataFile, |
50222
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
45 ForceAppend, |
50221
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
46 } |
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
47 |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
48 #[derive(Debug)] |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
49 pub struct DirstateMap<'on_disk> { |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
50 /// Contents of the `.hg/dirstate` file |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
51 pub(super) on_disk: &'on_disk [u8], |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
52 |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
53 pub(super) root: ChildNodes<'on_disk>, |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
54 |
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
55 /// Number of nodes anywhere in the tree that have `.entry.is_some()`. |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
56 pub(super) nodes_with_entry_count: u32, |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
57 |
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
58 /// Number of nodes anywhere in the tree that have |
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
59 /// `.copy_source.is_some()`. |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
60 pub(super) nodes_with_copy_source_count: u32, |
47409
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
61 |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
62 /// See on_disk::Header |
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
63 pub(super) ignore_patterns_hash: on_disk::IgnorePatternsHash, |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
64 |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
65 /// How many bytes of `on_disk` are not used anymore |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
66 pub(super) unreachable_bytes: u32, |
49145
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
67 |
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
68 /// Size of the data used to first load this `DirstateMap`. Used in case |
50243
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
69 /// we need to write some new metadata, but no new data on disk, |
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
70 /// as well as to detect writes that have happened in another process |
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
71 /// since first read. |
49145
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
72 pub(super) old_data_size: usize, |
49337
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
73 |
50243
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
74 /// UUID used when first loading this `DirstateMap`. Used to check if |
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
75 /// the UUID has been changed by another process since first read. |
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
76 /// Can be `None` if using dirstate v1 or if it's a brand new dirstate. |
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
77 pub(super) old_uuid: Option<Vec<u8>>, |
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
78 |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
79 /// Identity of the dirstate file (for dirstate-v1) or the docket file |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
80 /// (v2). Used to detect if the file has changed from another process. |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
81 /// Since it's always written atomically, we can compare the inode to |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
82 /// check the file identity. |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
83 /// |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
84 /// TODO On non-Unix systems, something like hashing is a possibility? |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
85 pub(super) identity: Option<u64>, |
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
86 |
49337
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
87 pub(super) dirstate_version: DirstateVersion, |
50222
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
88 |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
89 /// Controlled by config option `devel.dirstate.v2.data_update_mode` |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
90 pub(super) write_mode: DirstateMapWriteMode, |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
91 } |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
92 |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
93 /// Using a plain `HgPathBuf` of the full path from the repository root as a |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
94 /// map key would also work: all paths in a given map have the same parent |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
95 /// path, so comparing full paths gives the same result as comparing base |
47282
ce41ee53263f
dirstate-tree: Extract into a method sorting children of a given node
Simon Sapin <simon.sapin@octobus.net>
parents:
47280
diff
changeset
|
96 /// names. However `HashMap` would waste time always re-hashing the same |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
97 /// string prefix. |
47282
ce41ee53263f
dirstate-tree: Extract into a method sorting children of a given node
Simon Sapin <simon.sapin@octobus.net>
parents:
47280
diff
changeset
|
98 pub(super) type NodeKey<'on_disk> = WithBasename<Cow<'on_disk, HgPath>>; |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
99 |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
100 /// Similar to `&'tree Cow<'on_disk, HgPath>`, but can also be returned |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
101 /// for on-disk nodes that don’t actually have a `Cow` to borrow. |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
102 #[derive(Debug)] |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
103 pub(super) enum BorrowedPath<'tree, 'on_disk> { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
104 InMemory(&'tree HgPathBuf), |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
105 OnDisk(&'on_disk HgPath), |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
106 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
107 |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
108 #[derive(Debug)] |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
109 pub(super) enum ChildNodes<'on_disk> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
110 InMemory(FastHashMap<NodeKey<'on_disk>, Node<'on_disk>>), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
111 OnDisk(&'on_disk [on_disk::Node]), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
112 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
113 |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
114 #[derive(Debug)] |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
115 pub(super) enum ChildNodesRef<'tree, 'on_disk> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
116 InMemory(&'tree FastHashMap<NodeKey<'on_disk>, Node<'on_disk>>), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
117 OnDisk(&'on_disk [on_disk::Node]), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
118 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
119 |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
120 #[derive(Debug)] |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
121 pub(super) enum NodeRef<'tree, 'on_disk> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
122 InMemory(&'tree NodeKey<'on_disk>, &'tree Node<'on_disk>), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
123 OnDisk(&'on_disk on_disk::Node), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
124 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
125 |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
126 impl<'tree, 'on_disk> BorrowedPath<'tree, 'on_disk> { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
127 pub fn detach_from_tree(&self) -> Cow<'on_disk, HgPath> { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
128 match *self { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
129 BorrowedPath::InMemory(in_memory) => Cow::Owned(in_memory.clone()), |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
130 BorrowedPath::OnDisk(on_disk) => Cow::Borrowed(on_disk), |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
131 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
132 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
133 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
134 |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
135 impl<'tree, 'on_disk> std::ops::Deref for BorrowedPath<'tree, 'on_disk> { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
136 type Target = HgPath; |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
137 |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
138 fn deref(&self) -> &HgPath { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
139 match *self { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
140 BorrowedPath::InMemory(in_memory) => in_memory, |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
141 BorrowedPath::OnDisk(on_disk) => on_disk, |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
142 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
143 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
144 } |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
145 |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
146 impl Default for ChildNodes<'_> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
147 fn default() -> Self { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
148 ChildNodes::InMemory(Default::default()) |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
149 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
150 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
151 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
152 impl<'on_disk> ChildNodes<'on_disk> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
153 pub(super) fn as_ref<'tree>( |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
154 &'tree self, |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
155 ) -> ChildNodesRef<'tree, 'on_disk> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
156 match self { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
157 ChildNodes::InMemory(nodes) => ChildNodesRef::InMemory(nodes), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
158 ChildNodes::OnDisk(nodes) => ChildNodesRef::OnDisk(nodes), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
159 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
160 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
161 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
162 pub(super) fn is_empty(&self) -> bool { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
163 match self { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
164 ChildNodes::InMemory(nodes) => nodes.is_empty(), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
165 ChildNodes::OnDisk(nodes) => nodes.is_empty(), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
166 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
167 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
168 |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
169 fn make_mut( |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
170 &mut self, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
171 on_disk: &'on_disk [u8], |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
172 unreachable_bytes: &mut u32, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
173 ) -> Result< |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
174 &mut FastHashMap<NodeKey<'on_disk>, Node<'on_disk>>, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
175 DirstateV2ParseError, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
176 > { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
177 match self { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
178 ChildNodes::InMemory(nodes) => Ok(nodes), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
179 ChildNodes::OnDisk(nodes) => { |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
180 *unreachable_bytes += |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
181 std::mem::size_of_val::<[on_disk::Node]>(nodes) as u32; |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
182 let nodes = nodes |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
183 .iter() |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
184 .map(|node| { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
185 Ok(( |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
186 node.path(on_disk)?, |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
187 node.to_in_memory_node(on_disk)?, |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
188 )) |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
189 }) |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
190 .collect::<Result<_, _>>()?; |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
191 *self = ChildNodes::InMemory(nodes); |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
192 match self { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
193 ChildNodes::InMemory(nodes) => Ok(nodes), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
194 ChildNodes::OnDisk(_) => unreachable!(), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
195 } |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
196 } |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
197 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
198 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
199 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
200 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
201 impl<'tree, 'on_disk> ChildNodesRef<'tree, 'on_disk> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
202 pub(super) fn get( |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
203 &self, |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
204 base_name: &HgPath, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
205 on_disk: &'on_disk [u8], |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
206 ) -> Result<Option<NodeRef<'tree, 'on_disk>>, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
207 match self { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
208 ChildNodesRef::InMemory(nodes) => Ok(nodes |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
209 .get_key_value(base_name) |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
210 .map(|(k, v)| NodeRef::InMemory(k, v))), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
211 ChildNodesRef::OnDisk(nodes) => { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
212 let mut parse_result = Ok(()); |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
213 let search_result = nodes.binary_search_by(|node| { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
214 match node.base_name(on_disk) { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
215 Ok(node_base_name) => node_base_name.cmp(base_name), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
216 Err(e) => { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
217 parse_result = Err(e); |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
218 // Dummy comparison result, `search_result` won’t |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
219 // be used since `parse_result` is an error |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
220 std::cmp::Ordering::Equal |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
221 } |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
222 } |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
223 }); |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
224 parse_result.map(|()| { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
225 search_result.ok().map(|i| NodeRef::OnDisk(&nodes[i])) |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
226 }) |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
227 } |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
228 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
229 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
230 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
231 /// Iterate in undefined order |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
232 pub(super) fn iter( |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
233 &self, |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
234 ) -> impl Iterator<Item = NodeRef<'tree, 'on_disk>> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
235 match self { |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
236 ChildNodesRef::InMemory(nodes) => itertools::Either::Left( |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
237 nodes.iter().map(|(k, v)| NodeRef::InMemory(k, v)), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
238 ), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
239 ChildNodesRef::OnDisk(nodes) => { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
240 itertools::Either::Right(nodes.iter().map(NodeRef::OnDisk)) |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
241 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
242 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
243 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
244 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
245 /// Iterate in parallel in undefined order |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
246 pub(super) fn par_iter( |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
247 &self, |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
248 ) -> impl rayon::iter::ParallelIterator<Item = NodeRef<'tree, 'on_disk>> |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
249 { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
250 use rayon::prelude::*; |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
251 match self { |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
252 ChildNodesRef::InMemory(nodes) => rayon::iter::Either::Left( |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
253 nodes.par_iter().map(|(k, v)| NodeRef::InMemory(k, v)), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
254 ), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
255 ChildNodesRef::OnDisk(nodes) => rayon::iter::Either::Right( |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
256 nodes.par_iter().map(NodeRef::OnDisk), |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
257 ), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
258 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
259 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
260 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
261 pub(super) fn sorted(&self) -> Vec<NodeRef<'tree, 'on_disk>> { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
262 match self { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
263 ChildNodesRef::InMemory(nodes) => { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
264 let mut vec: Vec<_> = nodes |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
265 .iter() |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
266 .map(|(k, v)| NodeRef::InMemory(k, v)) |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
267 .collect(); |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
268 fn sort_key<'a>(node: &'a NodeRef) -> &'a HgPath { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
269 match node { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
270 NodeRef::InMemory(path, _node) => path.base_name(), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
271 NodeRef::OnDisk(_) => unreachable!(), |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
272 } |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
273 } |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
274 // `sort_unstable_by_key` doesn’t allow keys borrowing from the |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
275 // value: https://github.com/rust-lang/rust/issues/34162 |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
276 vec.sort_unstable_by(|a, b| sort_key(a).cmp(sort_key(b))); |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
277 vec |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
278 } |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
279 ChildNodesRef::OnDisk(nodes) => { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
280 // Nodes on disk are already sorted |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
281 nodes.iter().map(NodeRef::OnDisk).collect() |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
282 } |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
283 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
284 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
285 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
286 |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
287 impl<'tree, 'on_disk> NodeRef<'tree, 'on_disk> { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
288 pub(super) fn full_path( |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
289 &self, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
290 on_disk: &'on_disk [u8], |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
291 ) -> Result<&'tree HgPath, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
292 match self { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
293 NodeRef::InMemory(path, _node) => Ok(path.full_path()), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
294 NodeRef::OnDisk(node) => node.full_path(on_disk), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
295 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
296 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
297 |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
298 /// Returns a `BorrowedPath`, which can be turned into a `Cow<'on_disk, |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
299 /// HgPath>` detached from `'tree` |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
300 pub(super) fn full_path_borrowed( |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
301 &self, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
302 on_disk: &'on_disk [u8], |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
303 ) -> Result<BorrowedPath<'tree, 'on_disk>, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
304 match self { |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
305 NodeRef::InMemory(path, _node) => match path.full_path() { |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
306 Cow::Borrowed(on_disk) => Ok(BorrowedPath::OnDisk(on_disk)), |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
307 Cow::Owned(in_memory) => Ok(BorrowedPath::InMemory(in_memory)), |
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
308 }, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
309 NodeRef::OnDisk(node) => { |
47347
73ddcedeaadf
dirstate-tree: Change status() results to not borrow DirstateMap
Simon Sapin <simon.sapin@octobus.net>
parents:
47337
diff
changeset
|
310 Ok(BorrowedPath::OnDisk(node.full_path(on_disk)?)) |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
311 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
312 } |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
313 } |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
314 |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
315 pub(super) fn base_name( |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
316 &self, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
317 on_disk: &'on_disk [u8], |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
318 ) -> Result<&'tree HgPath, DirstateV2ParseError> { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
319 match self { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
320 NodeRef::InMemory(path, _node) => Ok(path.base_name()), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
321 NodeRef::OnDisk(node) => node.base_name(on_disk), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
322 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
323 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
324 |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
325 pub(super) fn children( |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
326 &self, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
327 on_disk: &'on_disk [u8], |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
328 ) -> Result<ChildNodesRef<'tree, 'on_disk>, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
329 match self { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
330 NodeRef::InMemory(_path, node) => Ok(node.children.as_ref()), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
331 NodeRef::OnDisk(node) => { |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
332 Ok(ChildNodesRef::OnDisk(node.children(on_disk)?)) |
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
333 } |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
334 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
335 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
336 |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
337 pub(super) fn has_copy_source(&self) -> bool { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
338 match self { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
339 NodeRef::InMemory(_path, node) => node.copy_source.is_some(), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
340 NodeRef::OnDisk(node) => node.has_copy_source(), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
341 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
342 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
343 |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
344 pub(super) fn copy_source( |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
345 &self, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
346 on_disk: &'on_disk [u8], |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
347 ) -> Result<Option<&'tree HgPath>, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
348 match self { |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
349 NodeRef::InMemory(_path, node) => Ok(node.copy_source.as_deref()), |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
350 NodeRef::OnDisk(node) => node.copy_source(on_disk), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
351 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
352 } |
48454
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
353 /// Returns a `BorrowedPath`, which can be turned into a `Cow<'on_disk, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
354 /// HgPath>` detached from `'tree` |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
355 pub(super) fn copy_source_borrowed( |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
356 &self, |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
357 on_disk: &'on_disk [u8], |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
358 ) -> Result<Option<BorrowedPath<'tree, 'on_disk>>, DirstateV2ParseError> |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
359 { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
360 Ok(match self { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
361 NodeRef::InMemory(_path, node) => { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
362 node.copy_source.as_ref().map(|source| match source { |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
363 Cow::Borrowed(on_disk) => BorrowedPath::OnDisk(on_disk), |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
364 Cow::Owned(in_memory) => BorrowedPath::InMemory(in_memory), |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
365 }) |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
366 } |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
367 NodeRef::OnDisk(node) => { |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
368 node.copy_source(on_disk)?.map(BorrowedPath::OnDisk) |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
369 } |
48454
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
370 }) |
473af5cbc209
rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net>
parents:
48421
diff
changeset
|
371 } |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
372 |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
373 pub(super) fn entry( |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
374 &self, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
375 ) -> Result<Option<DirstateEntry>, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
376 match self { |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
377 NodeRef::InMemory(_path, node) => { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
378 Ok(node.data.as_entry().copied()) |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
379 } |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
380 NodeRef::OnDisk(node) => node.entry(), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
381 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
382 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
383 |
47349
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
384 pub(super) fn cached_directory_mtime( |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
385 &self, |
48193
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
386 ) -> Result<Option<TruncatedTimestamp>, DirstateV2ParseError> { |
47349
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
387 match self { |
48193
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
388 NodeRef::InMemory(_path, node) => Ok(match node.data { |
47349
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
389 NodeData::CachedDirectory { mtime } => Some(mtime), |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
390 _ => None, |
48193
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
391 }), |
47349
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
392 NodeRef::OnDisk(node) => node.cached_directory_mtime(), |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
393 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
394 } |
7138c863d0a1
dirstate-v2: Skip readdir in status based on directory mtime
Simon Sapin <simon.sapin@octobus.net>
parents:
47348
diff
changeset
|
395 |
47478
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
396 pub(super) fn descendants_with_entry_count(&self) -> u32 { |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
397 match self { |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
398 NodeRef::InMemory(_path, node) => { |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
399 node.descendants_with_entry_count |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
400 } |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
401 NodeRef::OnDisk(node) => node.descendants_with_entry_count.get(), |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
402 } |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
403 } |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
404 |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
405 pub(super) fn tracked_descendants_count(&self) -> u32 { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
406 match self { |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
407 NodeRef::InMemory(_path, node) => node.tracked_descendants_count, |
47337
0654b3b3d2b5
dirstate-v2: Parse the dirstate lazily, with copy-on-write nodes
Simon Sapin <simon.sapin@octobus.net>
parents:
47336
diff
changeset
|
408 NodeRef::OnDisk(node) => node.tracked_descendants_count.get(), |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
409 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
410 } |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
411 } |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
412 |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
413 /// Represents a file or a directory |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
414 #[derive(Default, Debug)] |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
415 pub(super) struct Node<'on_disk> { |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
416 pub(super) data: NodeData, |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
417 |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
418 pub(super) copy_source: Option<Cow<'on_disk, HgPath>>, |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
419 |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
420 pub(super) children: ChildNodes<'on_disk>, |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
421 |
47478
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
422 /// How many (non-inclusive) descendants of this node have an entry. |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
423 pub(super) descendants_with_entry_count: u32, |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
424 |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
425 /// How many (non-inclusive) descendants of this node have an entry whose |
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
426 /// state is "tracked". |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
427 pub(super) tracked_descendants_count: u32, |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
428 } |
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
429 |
49125
28a6178a07a2
rust: add `Debug` trait to a bunch of structs
Raphaël Gomès <rgomes@octobus.net>
parents:
49124
diff
changeset
|
430 #[derive(Debug)] |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
431 pub(super) enum NodeData { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
432 Entry(DirstateEntry), |
48193
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
433 CachedDirectory { mtime: TruncatedTimestamp }, |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
434 None, |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
435 } |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
436 |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
437 impl Default for NodeData { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
438 fn default() -> Self { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
439 NodeData::None |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
440 } |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
441 } |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
442 |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
443 impl NodeData { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
444 fn has_entry(&self) -> bool { |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
445 matches!(self, NodeData::Entry(_)) |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
446 } |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
447 |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
448 fn as_entry(&self) -> Option<&DirstateEntry> { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
449 match self { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
450 NodeData::Entry(entry) => Some(entry), |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
451 _ => None, |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
452 } |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
453 } |
49106
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
454 |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
455 fn as_entry_mut(&mut self) -> Option<&mut DirstateEntry> { |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
456 match self { |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
457 NodeData::Entry(entry) => Some(entry), |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
458 _ => None, |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
459 } |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
460 } |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
461 } |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
462 |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
463 impl<'on_disk> DirstateMap<'on_disk> { |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
464 pub(super) fn empty(on_disk: &'on_disk [u8]) -> Self { |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
465 Self { |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
466 on_disk, |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
467 root: ChildNodes::default(), |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
468 nodes_with_entry_count: 0, |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
469 nodes_with_copy_source_count: 0, |
47409
0ef8231e413f
dirstate-v2: Store a hash of ignore patterns (.hgignore)
Simon Sapin <simon.sapin@octobus.net>
parents:
47352
diff
changeset
|
470 ignore_patterns_hash: [0; on_disk::IGNORE_PATTERNS_HASH_LEN], |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
471 unreachable_bytes: 0, |
49145
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
472 old_data_size: 0, |
50243
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
473 old_uuid: None, |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
474 identity: None, |
49337
6cd249556e20
rust-status: don't trigger dirstate v1 rewrite when only v2 data is changed
Raphaël Gomès <rgomes@octobus.net>
parents:
49145
diff
changeset
|
475 dirstate_version: DirstateVersion::V1, |
50222
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
476 write_mode: DirstateMapWriteMode::Auto, |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
477 } |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
478 } |
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
479 |
49913
c15b415d1bff
rust: use `logging_timer` instead of `micro_timer`
Raphaël Gomès <rgomes@octobus.net>
parents:
49373
diff
changeset
|
480 #[logging_timer::time("trace")] |
47675
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
481 pub fn new_v2( |
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
482 on_disk: &'on_disk [u8], |
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
483 data_size: usize, |
47682
78f7f0d490ee
dirstate-v2: Move fixed-size tree metadata into the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47681
diff
changeset
|
484 metadata: &[u8], |
50243
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
485 uuid: Vec<u8>, |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
486 identity: Option<u64>, |
47675
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
487 ) -> Result<Self, DirstateError> { |
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
488 if let Some(data) = on_disk.get(..data_size) { |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
489 Ok(on_disk::read(data, metadata, uuid, identity)?) |
47675
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
490 } else { |
49373
f8ec7b16c98f
rust: add message to `DirstateV2ParseError` to give some context
Raphaël Gomès <rgomes@octobus.net>
parents:
49365
diff
changeset
|
491 Err(DirstateV2ParseError::new("not enough bytes on disk").into()) |
47675
48aec076b8fb
dirstate-v2: Enforce data size read from the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47674
diff
changeset
|
492 } |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
493 } |
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
494 |
49913
c15b415d1bff
rust: use `logging_timer` instead of `micro_timer`
Raphaël Gomès <rgomes@octobus.net>
parents:
49373
diff
changeset
|
495 #[logging_timer::time("trace")] |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
496 pub fn new_v1( |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
497 on_disk: &'on_disk [u8], |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
498 identity: Option<u64>, |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
499 ) -> Result<(Self, Option<DirstateParents>), DirstateError> { |
47283
2a9ddc8094c7
dirstate-v2: Change the on-disk format to be tree-shaped
Simon Sapin <simon.sapin@octobus.net>
parents:
47282
diff
changeset
|
500 let mut map = Self::empty(on_disk); |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
501 if map.on_disk.is_empty() { |
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
502 return Ok((map, None)); |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
503 } |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
504 |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
505 let parents = parse_dirstate_entries( |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
506 map.on_disk, |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
507 |path, entry, copy_source| { |
49136
3f5e207f78be
rust: use `entry.tracked()` directly
Raphaël Gomès <rgomes@octobus.net>
parents:
49134
diff
changeset
|
508 let tracked = entry.tracked(); |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
509 let node = Self::get_or_insert_node_inner( |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
510 map.on_disk, |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
511 &mut map.unreachable_bytes, |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
512 &mut map.root, |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
513 path, |
47126
ecfe0819ada5
dirstate-tree: Borrow paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47125
diff
changeset
|
514 WithBasename::to_cow_borrowed, |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
515 |ancestor| { |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
516 if tracked { |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
517 ancestor.tracked_descendants_count += 1 |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
518 } |
47478
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
519 ancestor.descendants_with_entry_count += 1 |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
520 }, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
521 )?; |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
522 assert!( |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
523 !node.data.has_entry(), |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
524 "duplicate dirstate entry in read" |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
525 ); |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
526 assert!( |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
527 node.copy_source.is_none(), |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
528 "duplicate dirstate entry in read" |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
529 ); |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
530 node.data = NodeData::Entry(*entry); |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
531 node.copy_source = copy_source.map(Cow::Borrowed); |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
532 map.nodes_with_entry_count += 1; |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
533 if copy_source.is_some() { |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
534 map.nodes_with_copy_source_count += 1 |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
535 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
536 Ok(()) |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
537 }, |
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
538 )?; |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
539 let parents = Some(*parents); |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
540 map.identity = identity; |
47123
d8ac62374943
dirstate-tree: Make `DirstateMap` borrow from a bytes buffer
Simon Sapin <simon.sapin@octobus.net>
parents:
47121
diff
changeset
|
541 |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
542 Ok((map, parents)) |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
543 } |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
544 |
47678
065e61628980
dirstate-v2: Support appending to the same data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47675
diff
changeset
|
545 /// Assuming dirstate-v2 format, returns whether the next write should |
065e61628980
dirstate-v2: Support appending to the same data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47675
diff
changeset
|
546 /// append to the existing data file that contains `self.on_disk` (true), |
065e61628980
dirstate-v2: Support appending to the same data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47675
diff
changeset
|
547 /// or create a new data file from scratch (false). |
065e61628980
dirstate-v2: Support appending to the same data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47675
diff
changeset
|
548 pub(super) fn write_should_append(&self) -> bool { |
50222
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
549 match self.write_mode { |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
550 DirstateMapWriteMode::ForceAppend => true, |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
551 DirstateMapWriteMode::ForceNewDataFile => false, |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
552 DirstateMapWriteMode::Auto => { |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
553 let ratio = |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
554 self.unreachable_bytes as f32 / self.on_disk.len() as f32; |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
555 ratio < ACCEPTABLE_UNREACHABLE_BYTES_RATIO |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
556 } |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
557 } |
47678
065e61628980
dirstate-v2: Support appending to the same data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47675
diff
changeset
|
558 } |
065e61628980
dirstate-v2: Support appending to the same data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47675
diff
changeset
|
559 |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
560 fn get_node<'tree>( |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
561 &'tree self, |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
562 path: &HgPath, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
563 ) -> Result<Option<NodeRef<'tree, 'on_disk>>, DirstateV2ParseError> { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
564 let mut children = self.root.as_ref(); |
47099
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
565 let mut components = path.components(); |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
566 let mut component = |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
567 components.next().expect("expected at least one components"); |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
568 loop { |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
569 if let Some(child) = children.get(component, self.on_disk)? { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
570 if let Some(next_component) = components.next() { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
571 component = next_component; |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
572 children = child.children(self.on_disk)?; |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
573 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
574 return Ok(Some(child)); |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
575 } |
47099
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
576 } else { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
577 return Ok(None); |
47099
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
578 } |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
579 } |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
580 } |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
581 |
50863
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
582 pub fn has_node( |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
583 &self, |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
584 path: &HgPath, |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
585 ) -> Result<bool, DirstateV2ParseError> { |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
586 let node = self.get_node(path)?; |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
587 Ok(node.is_some()) |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
588 } |
264072107105
rust-status: error on non-existent files in file_set
Spencer Baugh <sbaugh@janestreet.com>
parents:
50724
diff
changeset
|
589 |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
590 /// Returns a mutable reference to the node at `path` if it exists |
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
591 /// |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
592 /// `each_ancestor` is a callback that is called for each ancestor node |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
593 /// when descending the tree. It is used to keep the different counters |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
594 /// of the `DirstateMap` up-to-date. |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
595 fn get_node_mut<'tree>( |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
596 &'tree mut self, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
597 path: &HgPath, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
598 each_ancestor: impl FnMut(&mut Node), |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
599 ) -> Result<Option<&'tree mut Node<'on_disk>>, DirstateV2ParseError> { |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
600 Self::get_node_mut_inner( |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
601 self.on_disk, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
602 &mut self.unreachable_bytes, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
603 &mut self.root, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
604 path, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
605 each_ancestor, |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
606 ) |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
607 } |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
608 |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
609 /// Lower-level version of `get_node_mut`. |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
610 /// |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
611 /// This takes `root` instead of `&mut self` so that callers can mutate |
49131
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
612 /// other fields while the returned borrow is still valid. |
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
613 /// |
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
614 /// `each_ancestor` is a callback that is called for each ancestor node |
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
615 /// when descending the tree. It is used to keep the different counters |
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
616 /// of the `DirstateMap` up-to-date. |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
617 fn get_node_mut_inner<'tree>( |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
618 on_disk: &'on_disk [u8], |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
619 unreachable_bytes: &mut u32, |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
620 root: &'tree mut ChildNodes<'on_disk>, |
47104
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
621 path: &HgPath, |
49131
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
622 mut each_ancestor: impl FnMut(&mut Node), |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
623 ) -> Result<Option<&'tree mut Node<'on_disk>>, DirstateV2ParseError> { |
47104
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
624 let mut children = root; |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
625 let mut components = path.components(); |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
626 let mut component = |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
627 components.next().expect("expected at least one components"); |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
628 loop { |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
629 if let Some(child) = children |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
630 .make_mut(on_disk, unreachable_bytes)? |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
631 .get_mut(component) |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
632 { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
633 if let Some(next_component) = components.next() { |
49131
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
634 each_ancestor(child); |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
635 component = next_component; |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
636 children = &mut child.children; |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
637 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
638 return Ok(Some(child)); |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
639 } |
47104
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
640 } else { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
641 return Ok(None); |
47104
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
642 } |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
643 } |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
644 } |
fdf6cfa0e254
dirstate-tree: Add copy_map_insert and copy_map_remove
Simon Sapin <simon.sapin@octobus.net>
parents:
47103
diff
changeset
|
645 |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
646 /// Get a mutable reference to the node at `path`, creating it if it does |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
647 /// not exist. |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
648 /// |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
649 /// `each_ancestor` is a callback that is called for each ancestor node |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
650 /// when descending the tree. It is used to keep the different counters |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
651 /// of the `DirstateMap` up-to-date. |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
652 fn get_or_insert_node<'tree, 'path>( |
47474
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
653 &'tree mut self, |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
654 path: &'path HgPath, |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
655 each_ancestor: impl FnMut(&mut Node), |
47474
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
656 ) -> Result<&'tree mut Node<'on_disk>, DirstateV2ParseError> { |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
657 Self::get_or_insert_node_inner( |
47474
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
658 self.on_disk, |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
659 &mut self.unreachable_bytes, |
47474
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
660 &mut self.root, |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
661 path, |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
662 WithBasename::to_cow_owned, |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
663 each_ancestor, |
47474
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
664 ) |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
665 } |
c657beacdf2e
dirstate-v2: Drop cached read_dir results after .hgignore changes
Simon Sapin <simon.sapin@octobus.net>
parents:
47409
diff
changeset
|
666 |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
667 /// Lower-level version of `get_or_insert_node_inner`, which is used when |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
668 /// parsing disk data to remove allocations for new nodes. |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
669 fn get_or_insert_node_inner<'tree, 'path>( |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
670 on_disk: &'on_disk [u8], |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
671 unreachable_bytes: &mut u32, |
47125
9be618452c3b
dirstate-tree: Borrow copy source paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47124
diff
changeset
|
672 root: &'tree mut ChildNodes<'on_disk>, |
47126
ecfe0819ada5
dirstate-tree: Borrow paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47125
diff
changeset
|
673 path: &'path HgPath, |
ecfe0819ada5
dirstate-tree: Borrow paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47125
diff
changeset
|
674 to_cow: impl Fn( |
ecfe0819ada5
dirstate-tree: Borrow paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47125
diff
changeset
|
675 WithBasename<&'path HgPath>, |
ecfe0819ada5
dirstate-tree: Borrow paths from the "on disk" bytes
Simon Sapin <simon.sapin@octobus.net>
parents:
47125
diff
changeset
|
676 ) -> WithBasename<Cow<'on_disk, HgPath>>, |
47120
7109a38830c9
dirstate-tree: Fold "tracked descendants" counter update in main walk
Simon Sapin <simon.sapin@octobus.net>
parents:
47119
diff
changeset
|
677 mut each_ancestor: impl FnMut(&mut Node), |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
678 ) -> Result<&'tree mut Node<'on_disk>, DirstateV2ParseError> { |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
679 let mut child_nodes = root; |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
680 let mut inclusive_ancestor_paths = |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
681 WithBasename::inclusive_ancestors_of(path); |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
682 let mut ancestor_path = inclusive_ancestor_paths |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
683 .next() |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
684 .expect("expected at least one inclusive ancestor"); |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
685 loop { |
48950
11c0411bf4e2
dirstate-tree: optimize HashMap lookups with raw_entry_mut
Simon Sapin <simon.sapin@octobus.net>
parents:
48454
diff
changeset
|
686 let (_, child_node) = child_nodes |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
687 .make_mut(on_disk, unreachable_bytes)? |
48950
11c0411bf4e2
dirstate-tree: optimize HashMap lookups with raw_entry_mut
Simon Sapin <simon.sapin@octobus.net>
parents:
48454
diff
changeset
|
688 .raw_entry_mut() |
11c0411bf4e2
dirstate-tree: optimize HashMap lookups with raw_entry_mut
Simon Sapin <simon.sapin@octobus.net>
parents:
48454
diff
changeset
|
689 .from_key(ancestor_path.base_name()) |
11c0411bf4e2
dirstate-tree: optimize HashMap lookups with raw_entry_mut
Simon Sapin <simon.sapin@octobus.net>
parents:
48454
diff
changeset
|
690 .or_insert_with(|| (to_cow(ancestor_path), Node::default())); |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
691 if let Some(next) = inclusive_ancestor_paths.next() { |
47120
7109a38830c9
dirstate-tree: Fold "tracked descendants" counter update in main walk
Simon Sapin <simon.sapin@octobus.net>
parents:
47119
diff
changeset
|
692 each_ancestor(child_node); |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
693 ancestor_path = next; |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
694 child_nodes = &mut child_node.children; |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
695 } else { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
696 return Ok(child_node); |
47097
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
697 } |
e66ea29e2b1a
dirstate-tree: Implement DirstateMap::read
Simon Sapin <simon.sapin@octobus.net>
parents:
47095
diff
changeset
|
698 } |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
699 } |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
700 |
49921
5fff90c7ea9d
rust-clippy: reassure `clippy` that 8 arguments is expected
Raphaël Gomès <rgomes@octobus.net>
parents:
49913
diff
changeset
|
701 #[allow(clippy::too_many_arguments)] |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
702 fn reset_state( |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
703 &mut self, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
704 filename: &HgPath, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
705 old_entry_opt: Option<DirstateEntry>, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
706 wc_tracked: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
707 p1_tracked: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
708 p2_info: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
709 has_meaningful_mtime: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
710 parent_file_data_opt: Option<ParentFileData>, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
711 ) -> Result<(), DirstateError> { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
712 let (had_entry, was_tracked) = match old_entry_opt { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
713 Some(old_entry) => (true, old_entry.tracked()), |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
714 None => (false, false), |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
715 }; |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
716 let node = self.get_or_insert_node(filename, |ancestor| { |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
717 if !had_entry { |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
718 ancestor.descendants_with_entry_count += 1; |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
719 } |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
720 if was_tracked { |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
721 if !wc_tracked { |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
722 ancestor.tracked_descendants_count = ancestor |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
723 .tracked_descendants_count |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
724 .checked_sub(1) |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
725 .expect("tracked count to be >= 0"); |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
726 } |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
727 } else if wc_tracked { |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
728 ancestor.tracked_descendants_count += 1; |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
729 } |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
730 })?; |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
731 |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
732 let v2_data = if let Some(parent_file_data) = parent_file_data_opt { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
733 DirstateV2Data { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
734 wc_tracked, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
735 p1_tracked, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
736 p2_info, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
737 mode_size: parent_file_data.mode_size, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
738 mtime: if has_meaningful_mtime { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
739 parent_file_data.mtime |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
740 } else { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
741 None |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
742 }, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
743 ..Default::default() |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
744 } |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
745 } else { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
746 DirstateV2Data { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
747 wc_tracked, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
748 p1_tracked, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
749 p2_info, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
750 ..Default::default() |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
751 } |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
752 }; |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
753 node.data = NodeData::Entry(DirstateEntry::from_v2_data(v2_data)); |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
754 if !had_entry { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
755 self.nodes_with_entry_count += 1; |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
756 } |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
757 Ok(()) |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
758 } |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
759 |
49097
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
760 fn set_tracked( |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
761 &mut self, |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
762 filename: &HgPath, |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
763 old_entry_opt: Option<DirstateEntry>, |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
764 ) -> Result<bool, DirstateV2ParseError> { |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
765 let was_tracked = old_entry_opt.map_or(false, |e| e.tracked()); |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
766 let had_entry = old_entry_opt.is_some(); |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
767 let tracked_count_increment = if was_tracked { 0 } else { 1 }; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
768 let mut new = false; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
769 |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
770 let node = self.get_or_insert_node(filename, |ancestor| { |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
771 if !had_entry { |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
772 ancestor.descendants_with_entry_count += 1; |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
773 } |
49097
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
774 |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
775 ancestor.tracked_descendants_count += tracked_count_increment; |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
776 })?; |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
777 if let Some(old_entry) = old_entry_opt { |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
778 let mut e = old_entry; |
49097
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
779 if e.tracked() { |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
780 // XXX |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
781 // This is probably overkill for more case, but we need this to |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
782 // fully replace the `normallookup` call with `set_tracked` |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
783 // one. Consider smoothing this in the future. |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
784 e.set_possibly_dirty(); |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
785 } else { |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
786 new = true; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
787 e.set_tracked(); |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
788 } |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
789 node.data = NodeData::Entry(e) |
49097
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
790 } else { |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
791 node.data = NodeData::Entry(DirstateEntry::new_tracked()); |
49097
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
792 self.nodes_with_entry_count += 1; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
793 new = true; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
794 }; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
795 Ok(new) |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
796 } |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
797 |
49132
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
798 /// Set a node as untracked in the dirstate. |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
799 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
800 /// It is the responsibility of the caller to remove the copy source and/or |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
801 /// the entry itself if appropriate. |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
802 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
803 /// # Panics |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
804 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
805 /// Panics if the node does not exist. |
49108
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
806 fn set_untracked( |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
807 &mut self, |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
808 filename: &HgPath, |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
809 old_entry: DirstateEntry, |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
810 ) -> Result<(), DirstateV2ParseError> { |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
811 let node = self |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
812 .get_node_mut(filename, |ancestor| { |
49132
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
813 ancestor.tracked_descendants_count = ancestor |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
814 .tracked_descendants_count |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
815 .checked_sub(1) |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
816 .expect("tracked_descendants_count should be >= 0"); |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
817 })? |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
818 .expect("node should exist"); |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
819 let mut new_entry = old_entry; |
49108
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
820 new_entry.set_untracked(); |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
821 node.data = NodeData::Entry(new_entry); |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
822 Ok(()) |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
823 } |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
824 |
49132
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
825 /// Set a node as clean in the dirstate. |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
826 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
827 /// It is the responsibility of the caller to remove the copy source. |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
828 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
829 /// # Panics |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
830 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
831 /// Panics if the node does not exist. |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
832 fn set_clean( |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
833 &mut self, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
834 filename: &HgPath, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
835 old_entry: DirstateEntry, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
836 mode: u32, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
837 size: u32, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
838 mtime: TruncatedTimestamp, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
839 ) -> Result<(), DirstateError> { |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
840 let node = self |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
841 .get_node_mut(filename, |ancestor| { |
49132
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
842 if !old_entry.tracked() { |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
843 ancestor.tracked_descendants_count += 1; |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
844 } |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
845 })? |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
846 .expect("node should exist"); |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
847 let mut new_entry = old_entry; |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
848 new_entry.set_clean(mode, size, mtime); |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
849 node.data = NodeData::Entry(new_entry); |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
850 Ok(()) |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
851 } |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
852 |
49132
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
853 /// Set a node as possibly dirty in the dirstate. |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
854 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
855 /// # Panics |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
856 /// |
7276a6007573
rust-dirstatemap: use `get_node_mut` instead or `get_or_insert_node`
Raphaël Gomès <rgomes@octobus.net>
parents:
49131
diff
changeset
|
857 /// Panics if the node does not exist. |
49106
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
858 fn set_possibly_dirty( |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
859 &mut self, |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
860 filename: &HgPath, |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
861 ) -> Result<(), DirstateError> { |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
862 let node = self |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
863 .get_node_mut(filename, |_ancestor| {})? |
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
864 .expect("node should exist"); |
49106
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
865 let entry = node.data.as_entry_mut().expect("entry should exist"); |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
866 entry.set_possibly_dirty(); |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
867 node.data = NodeData::Entry(*entry); |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
868 Ok(()) |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
869 } |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
870 |
49127
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
871 /// Clears the cached mtime for the (potential) folder at `path`. |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
872 pub(super) fn clear_cached_mtime( |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
873 &mut self, |
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
874 path: &HgPath, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
875 ) -> Result<(), DirstateV2ParseError> { |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
876 let node = match self.get_node_mut(path, |_ancestor| {})? { |
49127
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
877 Some(node) => node, |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
878 None => return Ok(()), |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
879 }; |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
880 if let NodeData::CachedDirectory { .. } = &node.data { |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
881 node.data = NodeData::None |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
882 } |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
883 Ok(()) |
f3e8b0b0a8c2
rust-dirstatemap: add `clear_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49126
diff
changeset
|
884 } |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
885 |
49128
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
886 /// Sets the cached mtime for the (potential) folder at `path`. |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
887 pub(super) fn set_cached_mtime( |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
888 &mut self, |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
889 path: &HgPath, |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
890 mtime: TruncatedTimestamp, |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
891 ) -> Result<(), DirstateV2ParseError> { |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
892 let node = match self.get_node_mut(path, |_ancestor| {})? { |
49128
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
893 Some(node) => node, |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
894 None => return Ok(()), |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
895 }; |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
896 match &node.data { |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
897 NodeData::Entry(_) => {} // Don’t overwrite an entry |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
898 NodeData::CachedDirectory { .. } | NodeData::None => { |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
899 node.data = NodeData::CachedDirectory { mtime } |
464747faef14
rust-dirstatemap: add `set_cached_mtime` helper method
Raphaël Gomès <rgomes@octobus.net>
parents:
49127
diff
changeset
|
900 } |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
901 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
902 Ok(()) |
47103
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
903 } |
214ae40e136b
dirstate-tree: Maintain a counter of DirstateEntry’s and copy sources
Simon Sapin <simon.sapin@octobus.net>
parents:
47102
diff
changeset
|
904 |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
905 fn iter_nodes<'tree>( |
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
906 &'tree self, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
907 ) -> impl Iterator< |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
908 Item = Result<NodeRef<'tree, 'on_disk>, DirstateV2ParseError>, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
909 > + 'tree { |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
910 // Depth first tree traversal. |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
911 // |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
912 // If we could afford internal iteration and recursion, |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
913 // this would look like: |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
914 // |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
915 // ``` |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
916 // fn traverse_children( |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
917 // children: &ChildNodes, |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
918 // each: &mut impl FnMut(&Node), |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
919 // ) { |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
920 // for child in children.values() { |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
921 // traverse_children(&child.children, each); |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
922 // each(child); |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
923 // } |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
924 // } |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
925 // ``` |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
926 // |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
927 // However we want an external iterator and therefore can’t use the |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
928 // call stack. Use an explicit stack instead: |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
929 let mut stack = Vec::new(); |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
930 let mut iter = self.root.as_ref().iter(); |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
931 std::iter::from_fn(move || { |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
932 while let Some(child_node) = iter.next() { |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
933 let children = match child_node.children(self.on_disk) { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
934 Ok(children) => children, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
935 Err(error) => return Some(Err(error)), |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
936 }; |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
937 // Pseudo-recursion |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
938 let new_iter = children.iter(); |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
939 let old_iter = std::mem::replace(&mut iter, new_iter); |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
940 stack.push((child_node, old_iter)); |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
941 } |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
942 // Found the end of a `children.iter()` iterator. |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
943 if let Some((child_node, next_iter)) = stack.pop() { |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
944 // "Return" from pseudo-recursion by restoring state from the |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
945 // explicit stack |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
946 iter = next_iter; |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
947 |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
948 Some(Ok(child_node)) |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
949 } else { |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
950 // Reached the bottom of the stack, we’re done |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
951 None |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
952 } |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
953 }) |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
954 } |
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
955 |
49922
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
956 fn count_dropped_path(unreachable_bytes: &mut u32, path: Cow<HgPath>) { |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
957 if let Cow::Borrowed(path) = path { |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
958 *unreachable_bytes += path.len() as u32 |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
959 } |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
960 } |
50222
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
961 |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
962 pub(crate) fn set_write_mode(&mut self, write_mode: DirstateMapWriteMode) { |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
963 self.write_mode = write_mode; |
ecd28d89c29e
dirstate-v2: add devel config option to control write behavior
Raphaël Gomès <rgomes@octobus.net>
parents:
50221
diff
changeset
|
964 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
965 } |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
966 |
49924
66ffe3749a48
rust-clippy: simplify return type of debug function
Raphaël Gomès <rgomes@octobus.net>
parents:
49923
diff
changeset
|
967 type DebugDirstateTuple<'a> = (&'a HgPath, (u8, i32, i32, i32)); |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
968 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
969 impl OwningDirstateMap { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
970 pub fn clear(&mut self) { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
971 self.with_dmap_mut(|map| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
972 map.root = Default::default(); |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
973 map.nodes_with_entry_count = 0; |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
974 map.nodes_with_copy_source_count = 0; |
50724
a10d823a8e3d
dirstate: avoid leaking disk space in `hg debugrebuilddirstate`
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
50252
diff
changeset
|
975 map.unreachable_bytes = map.on_disk.len() as u32; |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
976 }); |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
977 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
978 |
49097
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
979 pub fn set_tracked( |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
980 &mut self, |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
981 filename: &HgPath, |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
982 ) -> Result<bool, DirstateV2ParseError> { |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
983 let old_entry_opt = self.get(filename)?; |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
984 self.with_dmap_mut(|map| map.set_tracked(filename, old_entry_opt)) |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
985 } |
791430b0b2d2
rust-dirstatemap: add `set_tracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49045
diff
changeset
|
986 |
49108
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
987 pub fn set_untracked( |
48047
9b2a51b2c36a
dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item
Simon Sapin <simon.sapin@octobus.net>
parents:
48046
diff
changeset
|
988 &mut self, |
9b2a51b2c36a
dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item
Simon Sapin <simon.sapin@octobus.net>
parents:
48046
diff
changeset
|
989 filename: &HgPath, |
49108
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
990 ) -> Result<bool, DirstateError> { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
991 let old_entry_opt = self.get(filename)?; |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
992 match old_entry_opt { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
993 None => Ok(false), |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
994 Some(old_entry) => { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
995 if !old_entry.tracked() { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
996 // `DirstateMap::set_untracked` is not a noop if |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
997 // already not tracked as it will decrement the |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
998 // tracked counters while going down. |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
999 return Ok(true); |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1000 } |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1001 if old_entry.added() { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1002 // Untracking an "added" entry will just result in a |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1003 // worthless entry (and other parts of the code will |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1004 // complain about it), just drop it entirely. |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1005 self.drop_entry_and_copy_source(filename)?; |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1006 return Ok(true); |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1007 } |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1008 if !old_entry.p2_info() { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1009 self.copy_map_remove(filename)?; |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1010 } |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1011 |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1012 self.with_dmap_mut(|map| { |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1013 map.set_untracked(filename, old_entry)?; |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1014 Ok(true) |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1015 }) |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1016 } |
119c7e2b4248
rust-dirstatemap: add `set_untracked` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49106
diff
changeset
|
1017 } |
47692
e5fb14a07866
dirstate-map: move most of `dirstate.update_file` logic in the dsmap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47683
diff
changeset
|
1018 } |
e5fb14a07866
dirstate-map: move most of `dirstate.update_file` logic in the dsmap
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47683
diff
changeset
|
1019 |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1020 pub fn set_clean( |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1021 &mut self, |
47107
7dfc598ddcfe
dirstate-tree: Add add_file, remove_file, and drop_file
Simon Sapin <simon.sapin@octobus.net>
parents:
47106
diff
changeset
|
1022 filename: &HgPath, |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1023 mode: u32, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1024 size: u32, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1025 mtime: TruncatedTimestamp, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1026 ) -> Result<(), DirstateError> { |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1027 let old_entry = match self.get(filename)? { |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1028 None => { |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1029 return Err( |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1030 DirstateMapError::PathNotFound(filename.into()).into() |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1031 ) |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1032 } |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1033 Some(e) => e, |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1034 }; |
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1035 self.copy_map_remove(filename)?; |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1036 self.with_dmap_mut(|map| { |
49104
b5c2aca84618
rust-dirstatemap: add `set_clean` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49101
diff
changeset
|
1037 map.set_clean(filename, old_entry, mode, size, mtime) |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1038 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1039 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1040 |
49106
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1041 pub fn set_possibly_dirty( |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1042 &mut self, |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1043 filename: &HgPath, |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1044 ) -> Result<(), DirstateError> { |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1045 if self.get(filename)?.is_none() { |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1046 return Err(DirstateMapError::PathNotFound(filename.into()).into()); |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1047 } |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1048 self.with_dmap_mut(|map| map.set_possibly_dirty(filename)) |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1049 } |
c1a3fdedc492
rust-dirstatemap: add `set_possibly_dirty` method
Raphaël Gomès <rgomes@octobus.net>
parents:
49104
diff
changeset
|
1050 |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1051 pub fn reset_state( |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1052 &mut self, |
47107
7dfc598ddcfe
dirstate-tree: Add add_file, remove_file, and drop_file
Simon Sapin <simon.sapin@octobus.net>
parents:
47106
diff
changeset
|
1053 filename: &HgPath, |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1054 wc_tracked: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1055 p1_tracked: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1056 p2_info: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1057 has_meaningful_mtime: bool, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1058 parent_file_data_opt: Option<ParentFileData>, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1059 ) -> Result<(), DirstateError> { |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1060 if !(p1_tracked || p2_info || wc_tracked) { |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1061 self.drop_entry_and_copy_source(filename)?; |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1062 return Ok(()); |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1063 } |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1064 self.copy_map_remove(filename)?; |
47511
eaae39894312
dirstate: move most of the `remove` logic with dirstatemap `removefile`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47478
diff
changeset
|
1065 let old_entry_opt = self.get(filename)?; |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1066 self.with_dmap_mut(|map| { |
49101
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1067 map.reset_state( |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1068 filename, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1069 old_entry_opt, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1070 wc_tracked, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1071 p1_tracked, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1072 p2_info, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1073 has_meaningful_mtime, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1074 parent_file_data_opt, |
dd0430434ce9
rust-dirstatemap: add Rust implementation of `reset_state`
Raphaël Gomès <rgomes@octobus.net>
parents:
49097
diff
changeset
|
1075 ) |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1076 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1077 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1078 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1079 pub fn drop_entry_and_copy_source( |
48050
2ac0e6b23222
dirstate: Replace dropfile with drop_item_and_copy_source
Simon Sapin <simon.sapin@octobus.net>
parents:
48048
diff
changeset
|
1080 &mut self, |
2ac0e6b23222
dirstate: Replace dropfile with drop_item_and_copy_source
Simon Sapin <simon.sapin@octobus.net>
parents:
48048
diff
changeset
|
1081 filename: &HgPath, |
2ac0e6b23222
dirstate: Replace dropfile with drop_item_and_copy_source
Simon Sapin <simon.sapin@octobus.net>
parents:
48048
diff
changeset
|
1082 ) -> Result<(), DirstateError> { |
49123
afe60def963d
rust-dirstatemap: use `DirstateEntry::tracked` directly
Raphaël Gomès <rgomes@octobus.net>
parents:
49121
diff
changeset
|
1083 let was_tracked = self.get(filename)?.map_or(false, |e| e.tracked()); |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1084 struct Dropped { |
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1085 was_tracked: bool, |
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1086 had_entry: bool, |
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1087 had_copy_source: bool, |
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1088 } |
47352
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1089 |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1090 /// If this returns `Ok(Some((dropped, removed)))`, then |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1091 /// |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1092 /// * `dropped` is about the leaf node that was at `filename` |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1093 /// * `removed` is whether this particular level of recursion just |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1094 /// removed a node in `nodes`. |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
1095 fn recur<'on_disk>( |
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
1096 on_disk: &'on_disk [u8], |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1097 unreachable_bytes: &mut u32, |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
1098 nodes: &mut ChildNodes<'on_disk>, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1099 path: &HgPath, |
47352
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1100 ) -> Result<Option<(Dropped, bool)>, DirstateV2ParseError> { |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1101 let (first_path_component, rest_of_path) = |
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1102 path.split_first_component(); |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1103 let nodes = nodes.make_mut(on_disk, unreachable_bytes)?; |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1104 let node = if let Some(node) = nodes.get_mut(first_path_component) |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1105 { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1106 node |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1107 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1108 return Ok(None); |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1109 }; |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1110 let dropped; |
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1111 if let Some(rest) = rest_of_path { |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1112 if let Some((d, removed)) = recur( |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1113 on_disk, |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1114 unreachable_bytes, |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1115 &mut node.children, |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1116 rest, |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1117 )? { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1118 dropped = d; |
47478
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
1119 if dropped.had_entry { |
49001
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1120 node.descendants_with_entry_count = node |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1121 .descendants_with_entry_count |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1122 .checked_sub(1) |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1123 .expect( |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1124 "descendants_with_entry_count should be >= 0", |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1125 ); |
47478
ca8121d26732
dirstate-tree: Keep a counter of descendant nodes that have an entry
Simon Sapin <simon.sapin@octobus.net>
parents:
47477
diff
changeset
|
1126 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1127 if dropped.was_tracked { |
49001
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1128 node.tracked_descendants_count = node |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1129 .tracked_descendants_count |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1130 .checked_sub(1) |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1131 .expect( |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1132 "tracked_descendants_count should be >= 0", |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1133 ); |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1134 } |
47352
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1135 |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1136 // Directory caches must be invalidated when removing a |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1137 // child node |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1138 if removed { |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1139 if let NodeData::CachedDirectory { .. } = &node.data { |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1140 node.data = NodeData::None |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1141 } |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1142 } |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1143 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1144 return Ok(None); |
47120
7109a38830c9
dirstate-tree: Fold "tracked descendants" counter update in main walk
Simon Sapin <simon.sapin@octobus.net>
parents:
47119
diff
changeset
|
1145 } |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1146 } else { |
49002
fbc02ccc207e
rust-dirstatemap: properly decrement counter for tracked descendants
Raphaël Gomès <rgomes@octobus.net>
parents:
49001
diff
changeset
|
1147 let entry = node.data.as_entry(); |
fbc02ccc207e
rust-dirstatemap: properly decrement counter for tracked descendants
Raphaël Gomès <rgomes@octobus.net>
parents:
49001
diff
changeset
|
1148 let was_tracked = entry.map_or(false, |entry| entry.tracked()); |
fbc02ccc207e
rust-dirstatemap: properly decrement counter for tracked descendants
Raphaël Gomès <rgomes@octobus.net>
parents:
49001
diff
changeset
|
1149 let had_entry = entry.is_some(); |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
1150 if had_entry { |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
1151 node.data = NodeData::None |
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
1152 } |
49003
ce919b1a1063
rust-dirstatemap: correctly decrement the copies counter
Raphaël Gomès <rgomes@octobus.net>
parents:
49002
diff
changeset
|
1153 let mut had_copy_source = false; |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1154 if let Some(source) = &node.copy_source { |
49922
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1155 DirstateMap::count_dropped_path( |
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1156 unreachable_bytes, |
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1157 Cow::Borrowed(source), |
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1158 ); |
49003
ce919b1a1063
rust-dirstatemap: correctly decrement the copies counter
Raphaël Gomès <rgomes@octobus.net>
parents:
49002
diff
changeset
|
1159 had_copy_source = true; |
48050
2ac0e6b23222
dirstate: Replace dropfile with drop_item_and_copy_source
Simon Sapin <simon.sapin@octobus.net>
parents:
48048
diff
changeset
|
1160 node.copy_source = None |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1161 } |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1162 dropped = Dropped { |
49002
fbc02ccc207e
rust-dirstatemap: properly decrement counter for tracked descendants
Raphaël Gomès <rgomes@octobus.net>
parents:
49001
diff
changeset
|
1163 was_tracked, |
47348
a4de570e61fa
dirstate-v2: Allow tree nodes without an entry to store a timestamp
Simon Sapin <simon.sapin@octobus.net>
parents:
47347
diff
changeset
|
1164 had_entry, |
49003
ce919b1a1063
rust-dirstatemap: correctly decrement the copies counter
Raphaël Gomès <rgomes@octobus.net>
parents:
49002
diff
changeset
|
1165 had_copy_source, |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1166 }; |
47193
47ccab19bf9f
dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry`
Simon Sapin <simon.sapin@octobus.net>
parents:
47192
diff
changeset
|
1167 } |
47ccab19bf9f
dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry`
Simon Sapin <simon.sapin@octobus.net>
parents:
47192
diff
changeset
|
1168 // After recursion, for both leaf (rest_of_path is None) nodes and |
47ccab19bf9f
dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry`
Simon Sapin <simon.sapin@octobus.net>
parents:
47192
diff
changeset
|
1169 // parent nodes, remove a node if it just became empty. |
47352
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1170 let remove = !node.data.has_entry() |
47193
47ccab19bf9f
dirstate-tree: Remove newly-empty nodes after removing a `DirstateEntry`
Simon Sapin <simon.sapin@octobus.net>
parents:
47192
diff
changeset
|
1171 && node.copy_source.is_none() |
47352
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1172 && node.children.is_empty(); |
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1173 if remove { |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1174 let (key, _) = |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1175 nodes.remove_entry(first_path_component).unwrap(); |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1176 DirstateMap::count_dropped_path( |
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1177 unreachable_bytes, |
49922
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1178 Cow::Borrowed(key.full_path()), |
47681
d94118365ec5
dirstate-v2: Add heuristic for when to create a new data file
Simon Sapin <simon.sapin@octobus.net>
parents:
47678
diff
changeset
|
1179 ) |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1180 } |
47352
9d58e54b5966
dirstate-v2: Drop parent directory cache when removing a dirstate node
Simon Sapin <simon.sapin@octobus.net>
parents:
47351
diff
changeset
|
1181 Ok(Some((dropped, remove))) |
47192
1249eb9cc332
dirstate-tree: Refactor DirstateMap::drop_file to be recursive
Simon Sapin <simon.sapin@octobus.net>
parents:
47126
diff
changeset
|
1182 } |
47107
7dfc598ddcfe
dirstate-tree: Add add_file, remove_file, and drop_file
Simon Sapin <simon.sapin@octobus.net>
parents:
47106
diff
changeset
|
1183 |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1184 self.with_dmap_mut(|map| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1185 if let Some((dropped, _removed)) = recur( |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1186 map.on_disk, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1187 &mut map.unreachable_bytes, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1188 &mut map.root, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1189 filename, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1190 )? { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1191 if dropped.had_entry { |
49001
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1192 map.nodes_with_entry_count = map |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1193 .nodes_with_entry_count |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1194 .checked_sub(1) |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1195 .expect("nodes_with_entry_count should be >= 0"); |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1196 } |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1197 if dropped.had_copy_source { |
49001
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1198 map.nodes_with_copy_source_count = map |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1199 .nodes_with_copy_source_count |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1200 .checked_sub(1) |
2593873cda0f
rust-dirstate: panic if the DirstateMap counters go below 0
Raphaël Gomès <rgomes@octobus.net>
parents:
49000
diff
changeset
|
1201 .expect("nodes_with_copy_source_count should be >= 0"); |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1202 } |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1203 } else { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1204 debug_assert!(!was_tracked); |
47107
7dfc598ddcfe
dirstate-tree: Add add_file, remove_file, and drop_file
Simon Sapin <simon.sapin@octobus.net>
parents:
47106
diff
changeset
|
1205 } |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1206 Ok(()) |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1207 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1208 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1209 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1210 pub fn has_tracked_dir( |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1211 &mut self, |
47106
52906934b775
dirstate-tree: Add has_dir and has_tracked_dir
Simon Sapin <simon.sapin@octobus.net>
parents:
47105
diff
changeset
|
1212 directory: &HgPath, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1213 ) -> Result<bool, DirstateError> { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1214 self.with_dmap_mut(|map| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1215 if let Some(node) = map.get_node(directory)? { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1216 // A node without a `DirstateEntry` was created to hold child |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1217 // nodes, and is therefore a directory. |
49140
748ac6400eaa
rust-dirstatemap: stop using `state()` in the cache logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49136
diff
changeset
|
1218 let is_dir = node.entry()?.is_none(); |
748ac6400eaa
rust-dirstatemap: stop using `state()` in the cache logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49136
diff
changeset
|
1219 Ok(is_dir && node.tracked_descendants_count() > 0) |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1220 } else { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1221 Ok(false) |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1222 } |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1223 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1224 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1225 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1226 pub fn has_dir( |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1227 &mut self, |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1228 directory: &HgPath, |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1229 ) -> Result<bool, DirstateError> { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1230 self.with_dmap_mut(|map| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1231 if let Some(node) = map.get_node(directory)? { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1232 // A node without a `DirstateEntry` was created to hold child |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1233 // nodes, and is therefore a directory. |
49140
748ac6400eaa
rust-dirstatemap: stop using `state()` in the cache logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49136
diff
changeset
|
1234 let is_dir = node.entry()?.is_none(); |
748ac6400eaa
rust-dirstatemap: stop using `state()` in the cache logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49136
diff
changeset
|
1235 Ok(is_dir && node.descendants_with_entry_count() > 0) |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1236 } else { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1237 Ok(false) |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1238 } |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1239 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1240 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1241 |
49913
c15b415d1bff
rust: use `logging_timer` instead of `micro_timer`
Raphaël Gomès <rgomes@octobus.net>
parents:
49373
diff
changeset
|
1242 #[logging_timer::time("trace")] |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1243 pub fn pack_v1( |
48416
c1b633db67fc
rust: Serializing a DirstateMap does not mutate it anymore
Simon Sapin <simon.sapin@octobus.net>
parents:
48392
diff
changeset
|
1244 &self, |
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1245 parents: DirstateParents, |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1246 ) -> Result<Vec<u8>, DirstateError> { |
48416
c1b633db67fc
rust: Serializing a DirstateMap does not mutate it anymore
Simon Sapin <simon.sapin@octobus.net>
parents:
48392
diff
changeset
|
1247 let map = self.get_map(); |
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1248 // Optizimation (to be measured?): pre-compute size to avoid `Vec` |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1249 // reallocations |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1250 let mut size = parents.as_bytes().len(); |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1251 for node in map.iter_nodes() { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1252 let node = node?; |
48392
434de12918fd
dirstate: remove need_delay logic
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48260
diff
changeset
|
1253 if node.entry()?.is_some() { |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
1254 size += packed_entry_size( |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1255 node.full_path(map.on_disk)?, |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1256 node.copy_source(map.on_disk)?, |
47336
8d0260d0dbc9
dirstate-v2: Make the dirstate bytes buffer available in more places
Simon Sapin <simon.sapin@octobus.net>
parents:
47335
diff
changeset
|
1257 ); |
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1258 } |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1259 } |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1260 |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1261 let mut packed = Vec::with_capacity(size); |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1262 packed.extend(parents.as_bytes()); |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1263 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1264 for node in map.iter_nodes() { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1265 let node = node?; |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1266 if let Some(entry) = node.entry()? { |
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1267 pack_entry( |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1268 node.full_path(map.on_disk)?, |
47333
69530e5d4fe5
dirstate-tree: Add `NodeRef` and `ChildNodesRef` enums
Simon Sapin <simon.sapin@octobus.net>
parents:
47332
diff
changeset
|
1269 &entry, |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1270 node.copy_source(map.on_disk)?, |
47102
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1271 &mut packed, |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1272 ); |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1273 } |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1274 } |
d6c94ca40863
dirstate-tree: Serialize to disk
Simon Sapin <simon.sapin@octobus.net>
parents:
47101
diff
changeset
|
1275 Ok(packed) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1276 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1277 |
47682
78f7f0d490ee
dirstate-v2: Move fixed-size tree metadata into the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47681
diff
changeset
|
1278 /// Returns new data and metadata together with whether that data should be |
78f7f0d490ee
dirstate-v2: Move fixed-size tree metadata into the docket file
Simon Sapin <simon.sapin@octobus.net>
parents:
47681
diff
changeset
|
1279 /// appended to the existing data file whose content is at |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1280 /// `map.on_disk` (true), instead of written to a new data file |
49145
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
1281 /// (false), and the previous size of data on disk. |
49913
c15b415d1bff
rust: use `logging_timer` instead of `micro_timer`
Raphaël Gomès <rgomes@octobus.net>
parents:
49373
diff
changeset
|
1282 #[logging_timer::time("trace")] |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1283 pub fn pack_v2( |
48416
c1b633db67fc
rust: Serializing a DirstateMap does not mutate it anymore
Simon Sapin <simon.sapin@octobus.net>
parents:
48392
diff
changeset
|
1284 &self, |
50221
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
1285 write_mode: DirstateMapWriteMode, |
49145
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
1286 ) -> Result<(Vec<u8>, on_disk::TreeMetadata, bool, usize), DirstateError> |
dd2503a63d33
rust-dirstate-v2: save proper data size if no new data on append
Raphaël Gomès <rgomes@octobus.net>
parents:
49003
diff
changeset
|
1287 { |
48416
c1b633db67fc
rust: Serializing a DirstateMap does not mutate it anymore
Simon Sapin <simon.sapin@octobus.net>
parents:
48392
diff
changeset
|
1288 let map = self.get_map(); |
50221
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
1289 on_disk::write(map, write_mode) |
47280
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
1290 } |
1766130fe9ba
dirstate-v2: Change the on-disk format when the requirement is enabled
Simon Sapin <simon.sapin@octobus.net>
parents:
47193
diff
changeset
|
1291 |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1292 /// `callback` allows the caller to process and do something with the |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1293 /// results of the status. This is needed to do so efficiently (i.e. |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1294 /// without cloning the `DirstateStatus` object with its paths) because |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1295 /// we need to borrow from `Self`. |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1296 pub fn with_status<R>( |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1297 &mut self, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1298 matcher: &(dyn Matcher + Sync), |
47112
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
47110
diff
changeset
|
1299 root_dir: PathBuf, |
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
47110
diff
changeset
|
1300 ignore_files: Vec<PathBuf>, |
d5956136d19d
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`
Simon Sapin <simon.sapin@octobus.net>
parents:
47110
diff
changeset
|
1301 options: StatusOptions, |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1302 callback: impl for<'r> FnOnce( |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1303 Result<(DirstateStatus<'r>, Vec<PatternFileWarning>), StatusError>, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1304 ) -> R, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1305 ) -> R { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1306 self.with_dmap_mut(|map| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1307 callback(super::status::status( |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1308 map, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1309 matcher, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1310 root_dir, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1311 ignore_files, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1312 options, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1313 )) |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1314 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1315 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1316 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1317 pub fn copy_map_len(&self) -> usize { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1318 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1319 map.nodes_with_copy_source_count as usize |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1320 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1321 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1322 pub fn copy_map_iter(&self) -> CopyMapIter<'_> { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1323 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1324 Box::new(filter_map_results(map.iter_nodes(), move |node| { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1325 Ok(if let Some(source) = node.copy_source(map.on_disk)? { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1326 Some((node.full_path(map.on_disk)?, source)) |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1327 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1328 None |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1329 }) |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
1330 })) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1331 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1332 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1333 pub fn copy_map_contains_key( |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1334 &self, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1335 key: &HgPath, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1336 ) -> Result<bool, DirstateV2ParseError> { |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1337 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1338 Ok(if let Some(node) = map.get_node(key)? { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1339 node.has_copy_source() |
47099
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
1340 } else { |
3da19db33cbc
dirstate-tree: Add map `get` and `contains_key` methods
Simon Sapin <simon.sapin@octobus.net>
parents:
47098
diff
changeset
|
1341 false |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1342 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1343 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1344 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1345 pub fn copy_map_get( |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1346 &self, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1347 key: &HgPath, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1348 ) -> Result<Option<&HgPath>, DirstateV2ParseError> { |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1349 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1350 if let Some(node) = map.get_node(key)? { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1351 if let Some(source) = node.copy_source(map.on_disk)? { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1352 return Ok(Some(source)); |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1353 } |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1354 } |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1355 Ok(None) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1356 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1357 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1358 pub fn copy_map_remove( |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1359 &mut self, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1360 key: &HgPath, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1361 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1362 self.with_dmap_mut(|map| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1363 let count = &mut map.nodes_with_copy_source_count; |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1364 let unreachable_bytes = &mut map.unreachable_bytes; |
49133
23a5659125c8
rust-dirstatemap: add simpler version of `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49132
diff
changeset
|
1365 Ok(DirstateMap::get_node_mut_inner( |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1366 map.on_disk, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1367 unreachable_bytes, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1368 &mut map.root, |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1369 key, |
49131
fcf6f943a142
rust-dirstatemap: add `each_ancestor` argument to `get_node_mut`
Raphaël Gomès <rgomes@octobus.net>
parents:
49130
diff
changeset
|
1370 |_ancestor| {}, |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1371 )? |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1372 .and_then(|node| { |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1373 if let Some(source) = &node.copy_source { |
49134
8c59d8adcf5b
rust-dirstatemap: use a checked sub instead of a potentially underflowing one
Raphaël Gomès <rgomes@octobus.net>
parents:
49133
diff
changeset
|
1374 *count = count |
8c59d8adcf5b
rust-dirstatemap: use a checked sub instead of a potentially underflowing one
Raphaël Gomès <rgomes@octobus.net>
parents:
49133
diff
changeset
|
1375 .checked_sub(1) |
8c59d8adcf5b
rust-dirstatemap: use a checked sub instead of a potentially underflowing one
Raphaël Gomès <rgomes@octobus.net>
parents:
49133
diff
changeset
|
1376 .expect("nodes_with_copy_source_count should be >= 0"); |
49922
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1377 DirstateMap::count_dropped_path( |
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1378 unreachable_bytes, |
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1379 Cow::Borrowed(source), |
b6dc4802e7ef
rust: don't use a reference to a `Cow`
Raphaël Gomès <rgomes@octobus.net>
parents:
49921
diff
changeset
|
1380 ); |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1381 } |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1382 node.copy_source.take().map(Cow::into_owned) |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1383 })) |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1384 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1385 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1386 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1387 pub fn copy_map_insert( |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1388 &mut self, |
49124
d9a66d62c604
rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert`
Raphaël Gomès <rgomes@octobus.net>
parents:
49123
diff
changeset
|
1389 key: &HgPath, |
d9a66d62c604
rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert`
Raphaël Gomès <rgomes@octobus.net>
parents:
49123
diff
changeset
|
1390 value: &HgPath, |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1391 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1392 self.with_dmap_mut(|map| { |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1393 let node = map.get_or_insert_node(key, |_ancestor| {})?; |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1394 let had_copy_source = node.copy_source.is_none(); |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1395 let old = node |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1396 .copy_source |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1397 .replace(value.to_owned().into()) |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1398 .map(Cow::into_owned); |
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1399 if had_copy_source { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1400 map.nodes_with_copy_source_count += 1 |
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1401 } |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1402 Ok(old) |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1403 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1404 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1405 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1406 pub fn len(&self) -> usize { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1407 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1408 map.nodes_with_entry_count as usize |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1409 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1410 |
49923
547d6817e0c3
rust-clippy: add `is_empty` method to please the `clippy` gods
Raphaël Gomès <rgomes@octobus.net>
parents:
49922
diff
changeset
|
1411 pub fn is_empty(&self) -> bool { |
547d6817e0c3
rust-clippy: add `is_empty` method to please the `clippy` gods
Raphaël Gomès <rgomes@octobus.net>
parents:
49922
diff
changeset
|
1412 self.len() == 0 |
547d6817e0c3
rust-clippy: add `is_empty` method to please the `clippy` gods
Raphaël Gomès <rgomes@octobus.net>
parents:
49922
diff
changeset
|
1413 } |
547d6817e0c3
rust-clippy: add `is_empty` method to please the `clippy` gods
Raphaël Gomès <rgomes@octobus.net>
parents:
49922
diff
changeset
|
1414 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1415 pub fn contains_key( |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1416 &self, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1417 key: &HgPath, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1418 ) -> Result<bool, DirstateV2ParseError> { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1419 Ok(self.get(key)?.is_some()) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1420 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1421 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1422 pub fn get( |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1423 &self, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1424 key: &HgPath, |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1425 ) -> Result<Option<DirstateEntry>, DirstateV2ParseError> { |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1426 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1427 Ok(if let Some(node) = map.get_node(key)? { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1428 node.entry()? |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1429 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1430 None |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1431 }) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1432 } |
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1433 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1434 pub fn iter(&self) -> StateMapIter<'_> { |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1435 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1436 Box::new(filter_map_results(map.iter_nodes(), move |node| { |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1437 Ok(if let Some(entry) = node.entry()? { |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1438 Some((node.full_path(map.on_disk)?, entry)) |
47335
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1439 } else { |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1440 None |
ed1583a845d2
dirstate-v2: Make more APIs fallible, returning Result
Simon Sapin <simon.sapin@octobus.net>
parents:
47334
diff
changeset
|
1441 }) |
47100
caa3031c9ed5
dirstate-tree: Add tree traversal/iteration
Simon Sapin <simon.sapin@octobus.net>
parents:
47099
diff
changeset
|
1442 })) |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1443 } |
47351
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1444 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1445 pub fn iter_tracked_dirs( |
47683
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1446 &mut self, |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1447 ) -> Result< |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1448 Box< |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1449 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1450 + Send |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1451 + '_, |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1452 >, |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1453 DirstateError, |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1454 > { |
49000
dd6b67d5c256
rust: fix unsound `OwningDirstateMap`
Raphaël Gomès <rgomes@octobus.net>
parents:
48454
diff
changeset
|
1455 let map = self.get_map(); |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1456 let on_disk = map.on_disk; |
47683
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1457 Ok(Box::new(filter_map_results( |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1458 map.iter_nodes(), |
47683
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1459 move |node| { |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1460 Ok(if node.tracked_descendants_count() > 0 { |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1461 Some(node.full_path(on_disk)?) |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1462 } else { |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1463 None |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1464 }) |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1465 }, |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1466 ))) |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1467 } |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1468 |
49120
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1469 /// Only public because it needs to be exposed to the Python layer. |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1470 /// It is not the full `setparents` logic, only the parts that mutate the |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1471 /// entries. |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1472 pub fn setparents_fixup( |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1473 &mut self, |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1474 ) -> Result<Vec<(HgPathBuf, HgPathBuf)>, DirstateV2ParseError> { |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1475 // XXX |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1476 // All the copying and re-querying is quite inefficient, but this is |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1477 // still a lot better than doing it from Python. |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1478 // |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1479 // The better solution is to develop a mechanism for `iter_mut`, |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1480 // which will be a lot more involved: we're dealing with a lazy, |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1481 // append-mostly, tree-like data structure. This will do for now. |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1482 let mut copies = vec![]; |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1483 let mut files_with_p2_info = vec![]; |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1484 for res in self.iter() { |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1485 let (path, entry) = res?; |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1486 if entry.p2_info() { |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1487 files_with_p2_info.push(path.to_owned()) |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1488 } |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1489 } |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1490 self.with_dmap_mut(|map| { |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1491 for path in files_with_p2_info.iter() { |
49130
3926bfef28e4
rust-dirstatemap: add simpler method `get_or_insert_node` for the common case
Raphaël Gomès <rgomes@octobus.net>
parents:
49129
diff
changeset
|
1492 let node = map.get_or_insert_node(path, |_| {})?; |
49120
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1493 let entry = |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1494 node.data.as_entry_mut().expect("entry should exist"); |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1495 entry.drop_merge_data(); |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1496 if let Some(source) = node.copy_source.take().as_deref() { |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1497 copies.push((path.to_owned(), source.to_owned())); |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1498 } |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1499 } |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1500 Ok(copies) |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1501 }) |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1502 } |
3df46f3a3d6c
rust-dirstatemap: implement part of the `setparents` logic
Raphaël Gomès <rgomes@octobus.net>
parents:
49112
diff
changeset
|
1503 |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1504 pub fn debug_iter( |
47351
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1505 &self, |
48023
357307feaf61
debugstate: Always call dirstatemap.debug_iter()
Simon Sapin <simon.sapin@octobus.net>
parents:
48022
diff
changeset
|
1506 all: bool, |
47351
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1507 ) -> Box< |
49924
66ffe3749a48
rust-clippy: simplify return type of debug function
Raphaël Gomès <rgomes@octobus.net>
parents:
49923
diff
changeset
|
1508 dyn Iterator<Item = Result<DebugDirstateTuple, DirstateV2ParseError>> |
66ffe3749a48
rust-clippy: simplify return type of debug function
Raphaël Gomès <rgomes@octobus.net>
parents:
49923
diff
changeset
|
1509 + Send |
47351
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1510 + '_, |
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1511 > { |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1512 let map = self.get_map(); |
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1513 Box::new(filter_map_results(map.iter_nodes(), move |node| { |
47683
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1514 let debug_tuple = if let Some(entry) = node.entry()? { |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1515 entry.debug_tuple() |
48023
357307feaf61
debugstate: Always call dirstatemap.debug_iter()
Simon Sapin <simon.sapin@octobus.net>
parents:
48022
diff
changeset
|
1516 } else if !all { |
357307feaf61
debugstate: Always call dirstatemap.debug_iter()
Simon Sapin <simon.sapin@octobus.net>
parents:
48022
diff
changeset
|
1517 return Ok(None); |
48193
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
1518 } else if let Some(mtime) = node.cached_directory_mtime()? { |
320de901896a
dirstate-v2: Truncate directory mtimes to 31 bits of seconds
Simon Sapin <simon.sapin@octobus.net>
parents:
48192
diff
changeset
|
1519 (b' ', 0, -1, mtime.truncated_seconds() as i32) |
47351
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1520 } else { |
47683
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1521 (b' ', 0, -1, -1) |
284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
Simon Sapin <simon.sapin@octobus.net>
parents:
47682
diff
changeset
|
1522 }; |
48069
3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
Simon Sapin <simon.sapin@octobus.net>
parents:
48068
diff
changeset
|
1523 Ok(Some((node.full_path(map.on_disk)?, debug_tuple))) |
47351
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1524 })) |
3b9914b28133
dirstate-v2: Add --dirs to debugdirstate command
Simon Sapin <simon.sapin@octobus.net>
parents:
47349
diff
changeset
|
1525 } |
47095
473abf4728bf
dirstate-tree: Empty shell for a second Rust DirstateMap implementation
Simon Sapin <simon.sapin@octobus.net>
parents:
diff
changeset
|
1526 } |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1527 #[cfg(test)] |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1528 mod tests { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1529 use super::*; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1530 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1531 /// Shortcut to return tracked descendants of a path. |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1532 /// Panics if the path does not exist. |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1533 fn tracked_descendants(map: &OwningDirstateMap, path: &[u8]) -> u32 { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1534 let path = dbg!(HgPath::new(path)); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1535 let node = map.get_map().get_node(path); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1536 node.unwrap().unwrap().tracked_descendants_count() |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1537 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1538 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1539 /// Shortcut to return descendants with an entry. |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1540 /// Panics if the path does not exist. |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1541 fn descendants_with_an_entry(map: &OwningDirstateMap, path: &[u8]) -> u32 { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1542 let path = dbg!(HgPath::new(path)); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1543 let node = map.get_map().get_node(path); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1544 node.unwrap().unwrap().descendants_with_entry_count() |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1545 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1546 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1547 fn assert_does_not_exist(map: &OwningDirstateMap, path: &[u8]) { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1548 let path = dbg!(HgPath::new(path)); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1549 let node = map.get_map().get_node(path); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1550 assert!(node.unwrap().is_none()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1551 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1552 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1553 /// Shortcut for path creation in tests |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1554 fn p(b: &[u8]) -> &HgPath { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1555 HgPath::new(b) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1556 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1557 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1558 /// Test the very simple case a single tracked file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1559 #[test] |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1560 fn test_tracked_descendants_simple() -> Result<(), DirstateError> { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1561 let mut map = OwningDirstateMap::new_empty(vec![]); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1562 assert_eq!(map.len(), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1563 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1564 map.set_tracked(p(b"some/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1565 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1566 assert_eq!(map.len(), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1567 assert_eq!(tracked_descendants(&map, b"some"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1568 assert_eq!(tracked_descendants(&map, b"some/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1569 assert_eq!(tracked_descendants(&map, b"some/nested/path"), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1570 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1571 map.set_untracked(p(b"some/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1572 assert_eq!(map.len(), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1573 assert!(map.get_map().get_node(p(b"some"))?.is_none()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1574 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1575 Ok(()) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1576 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1577 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1578 /// Test the simple case of all tracked, but multiple files |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1579 #[test] |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1580 fn test_tracked_descendants_multiple() -> Result<(), DirstateError> { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1581 let mut map = OwningDirstateMap::new_empty(vec![]); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1582 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1583 map.set_tracked(p(b"some/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1584 map.set_tracked(p(b"some/nested/file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1585 // one layer without any files to test deletion cascade |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1586 map.set_tracked(p(b"some/other/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1587 map.set_tracked(p(b"root_file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1588 map.set_tracked(p(b"some/file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1589 map.set_tracked(p(b"some/file2"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1590 map.set_tracked(p(b"some/file3"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1591 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1592 assert_eq!(map.len(), 7); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1593 assert_eq!(tracked_descendants(&map, b"some"), 6); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1594 assert_eq!(tracked_descendants(&map, b"some/nested"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1595 assert_eq!(tracked_descendants(&map, b"some/other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1596 assert_eq!(tracked_descendants(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1597 assert_eq!(tracked_descendants(&map, b"some/nested/path"), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1598 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1599 map.set_untracked(p(b"some/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1600 assert_eq!(map.len(), 6); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1601 assert_eq!(tracked_descendants(&map, b"some"), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1602 assert_eq!(tracked_descendants(&map, b"some/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1603 assert_eq!(tracked_descendants(&map, b"some/other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1604 assert_eq!(tracked_descendants(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1605 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1606 map.set_untracked(p(b"some/nested/file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1607 assert_eq!(map.len(), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1608 assert_eq!(tracked_descendants(&map, b"some"), 4); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1609 assert_eq!(tracked_descendants(&map, b"some/other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1610 assert_eq!(tracked_descendants(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1611 assert_does_not_exist(&map, b"some_nested"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1612 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1613 map.set_untracked(p(b"some/other/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1614 assert_eq!(map.len(), 4); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1615 assert_eq!(tracked_descendants(&map, b"some"), 3); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1616 assert_does_not_exist(&map, b"some/other"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1617 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1618 map.set_untracked(p(b"root_file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1619 assert_eq!(map.len(), 3); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1620 assert_eq!(tracked_descendants(&map, b"some"), 3); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1621 assert_does_not_exist(&map, b"root_file"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1622 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1623 map.set_untracked(p(b"some/file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1624 assert_eq!(map.len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1625 assert_eq!(tracked_descendants(&map, b"some"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1626 assert_does_not_exist(&map, b"some/file"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1627 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1628 map.set_untracked(p(b"some/file2"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1629 assert_eq!(map.len(), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1630 assert_eq!(tracked_descendants(&map, b"some"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1631 assert_does_not_exist(&map, b"some/file2"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1632 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1633 map.set_untracked(p(b"some/file3"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1634 assert_eq!(map.len(), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1635 assert_does_not_exist(&map, b"some/file3"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1636 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1637 Ok(()) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1638 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1639 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1640 /// Check with a mix of tracked and non-tracked items |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1641 #[test] |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1642 fn test_tracked_descendants_different() -> Result<(), DirstateError> { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1643 let mut map = OwningDirstateMap::new_empty(vec![]); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1644 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1645 // A file that was just added |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1646 map.set_tracked(p(b"some/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1647 // This has no information, the dirstate should ignore it |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1648 map.reset_state(p(b"some/file"), false, false, false, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1649 assert_does_not_exist(&map, b"some/file"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1650 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1651 // A file that was removed |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1652 map.reset_state( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1653 p(b"some/nested/file"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1654 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1655 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1656 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1657 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1658 None, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1659 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1660 assert!(!map.get(p(b"some/nested/file"))?.unwrap().tracked()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1661 // Only present in p2 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1662 map.reset_state(p(b"some/file3"), false, false, true, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1663 assert!(!map.get(p(b"some/file3"))?.unwrap().tracked()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1664 // A file that was merged |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1665 map.reset_state(p(b"root_file"), true, true, true, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1666 assert!(map.get(p(b"root_file"))?.unwrap().tracked()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1667 // A file that is added, with info from p2 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1668 // XXX is that actually possible? |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1669 map.reset_state(p(b"some/file2"), true, false, true, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1670 assert!(map.get(p(b"some/file2"))?.unwrap().tracked()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1671 // A clean file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1672 // One layer without any files to test deletion cascade |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1673 map.reset_state( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1674 p(b"some/other/nested/path"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1675 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1676 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1677 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1678 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1679 None, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1680 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1681 assert!(map.get(p(b"some/other/nested/path"))?.unwrap().tracked()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1682 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1683 assert_eq!(map.len(), 6); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1684 assert_eq!(tracked_descendants(&map, b"some"), 3); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1685 assert_eq!(descendants_with_an_entry(&map, b"some"), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1686 assert_eq!(tracked_descendants(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1687 assert_eq!(descendants_with_an_entry(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1688 assert_eq!(tracked_descendants(&map, b"some/other/nested/path"), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1689 assert_eq!( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1690 descendants_with_an_entry(&map, b"some/other/nested/path"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1691 0 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1692 ); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1693 assert_eq!(tracked_descendants(&map, b"some/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1694 assert_eq!(descendants_with_an_entry(&map, b"some/nested"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1695 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1696 // might as well check this |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1697 map.set_untracked(p(b"path/does/not/exist"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1698 assert_eq!(map.len(), 6); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1699 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1700 map.set_untracked(p(b"some/other/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1701 // It is set untracked but not deleted since it held other information |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1702 assert_eq!(map.len(), 6); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1703 assert_eq!(tracked_descendants(&map, b"some"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1704 assert_eq!(descendants_with_an_entry(&map, b"some"), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1705 assert_eq!(descendants_with_an_entry(&map, b"some/other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1706 assert_eq!(descendants_with_an_entry(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1707 assert_eq!(tracked_descendants(&map, b"some/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1708 assert_eq!(descendants_with_an_entry(&map, b"some/nested"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1709 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1710 map.set_untracked(p(b"some/nested/path"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1711 // It is set untracked *and* deleted since it was only added |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1712 assert_eq!(map.len(), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1713 assert_eq!(tracked_descendants(&map, b"some"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1714 assert_eq!(descendants_with_an_entry(&map, b"some"), 4); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1715 assert_eq!(tracked_descendants(&map, b"some/nested"), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1716 assert_eq!(descendants_with_an_entry(&map, b"some/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1717 assert_does_not_exist(&map, b"some/nested/path"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1718 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1719 map.set_untracked(p(b"root_file"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1720 // Untracked but not deleted |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1721 assert_eq!(map.len(), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1722 assert!(map.get(p(b"root_file"))?.is_some()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1723 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1724 map.set_untracked(p(b"some/file2"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1725 assert_eq!(map.len(), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1726 assert_eq!(tracked_descendants(&map, b"some"), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1727 assert!(map.get(p(b"some/file2"))?.is_some()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1728 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1729 map.set_untracked(p(b"some/file3"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1730 assert_eq!(map.len(), 5); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1731 assert_eq!(tracked_descendants(&map, b"some"), 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1732 assert!(map.get(p(b"some/file3"))?.is_some()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1733 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1734 Ok(()) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1735 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1736 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1737 /// Check that copies counter is correctly updated |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1738 #[test] |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1739 fn test_copy_source() -> Result<(), DirstateError> { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1740 let mut map = OwningDirstateMap::new_empty(vec![]); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1741 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1742 // Clean file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1743 map.reset_state(p(b"files/clean"), true, true, false, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1744 // Merged file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1745 map.reset_state(p(b"files/from_p2"), true, true, true, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1746 // Removed file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1747 map.reset_state(p(b"removed"), false, true, false, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1748 // Added file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1749 map.reset_state(p(b"files/added"), true, false, false, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1750 // Add copy |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1751 map.copy_map_insert(p(b"files/clean"), p(b"clean_copy_source"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1752 assert_eq!(map.copy_map_len(), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1753 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1754 // Copy override |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1755 map.copy_map_insert(p(b"files/clean"), p(b"other_clean_copy_source"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1756 assert_eq!(map.copy_map_len(), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1757 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1758 // Multiple copies |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1759 map.copy_map_insert(p(b"removed"), p(b"removed_copy_source"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1760 assert_eq!(map.copy_map_len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1761 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1762 map.copy_map_insert(p(b"files/added"), p(b"added_copy_source"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1763 assert_eq!(map.copy_map_len(), 3); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1764 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1765 // Added, so the entry is completely removed |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1766 map.set_untracked(p(b"files/added"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1767 assert_does_not_exist(&map, b"files/added"); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1768 assert_eq!(map.copy_map_len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1769 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1770 // Removed, so the entry is kept around, so is its copy |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1771 map.set_untracked(p(b"removed"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1772 assert!(map.get(p(b"removed"))?.is_some()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1773 assert_eq!(map.copy_map_len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1774 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1775 // Clean, so the entry is kept around, but not its copy |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1776 map.set_untracked(p(b"files/clean"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1777 assert!(map.get(p(b"files/clean"))?.is_some()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1778 assert_eq!(map.copy_map_len(), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1779 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1780 map.copy_map_insert(p(b"files/from_p2"), p(b"from_p2_copy_source"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1781 assert_eq!(map.copy_map_len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1782 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1783 // Info from p2, so its copy source info is kept around |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1784 map.set_untracked(p(b"files/from_p2"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1785 assert!(map.get(p(b"files/from_p2"))?.is_some()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1786 assert_eq!(map.copy_map_len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1787 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1788 Ok(()) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1789 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1790 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1791 /// Test with "on disk" data. For the sake of this test, the "on disk" data |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1792 /// does not actually come from the disk, but it's opaque to the code being |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1793 /// tested. |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1794 #[test] |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1795 fn test_on_disk() -> Result<(), DirstateError> { |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1796 // First let's create some data to put "on disk" |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1797 let mut map = OwningDirstateMap::new_empty(vec![]); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1798 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1799 // A file that was just added |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1800 map.set_tracked(p(b"some/nested/added"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1801 map.copy_map_insert(p(b"some/nested/added"), p(b"added_copy_source"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1802 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1803 // A file that was removed |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1804 map.reset_state( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1805 p(b"some/nested/removed"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1806 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1807 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1808 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1809 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1810 None, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1811 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1812 // Only present in p2 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1813 map.reset_state( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1814 p(b"other/p2_info_only"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1815 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1816 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1817 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1818 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1819 None, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1820 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1821 map.copy_map_insert( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1822 p(b"other/p2_info_only"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1823 p(b"other/p2_info_copy_source"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1824 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1825 // A file that was merged |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1826 map.reset_state(p(b"merged"), true, true, true, false, None)?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1827 // A file that is added, with info from p2 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1828 // XXX is that actually possible? |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1829 map.reset_state( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1830 p(b"other/added_with_p2"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1831 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1832 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1833 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1834 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1835 None, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1836 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1837 // One layer without any files to test deletion cascade |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1838 // A clean file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1839 map.reset_state( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1840 p(b"some/other/nested/clean"), |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1841 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1842 true, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1843 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1844 false, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1845 None, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1846 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1847 |
49147 | 1848 let (packed, metadata, _should_append, _old_data_size) = |
50221
1891086f6c7f
dirstate: use more than a bool to control append behavior
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49373
diff
changeset
|
1849 map.pack_v2(DirstateMapWriteMode::ForceNewDataFile)?; |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1850 let packed_len = packed.len(); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1851 assert!(packed_len > 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1852 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1853 // Recreate "from disk" |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1854 let mut map = OwningDirstateMap::new_v2( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1855 packed, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1856 packed_len, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1857 metadata.as_bytes(), |
50243
6cce0afc1454
rust-dirstate: remember the data file uuid dirstate was loaded with
Raphaël Gomès <rgomes@octobus.net>
parents:
50222
diff
changeset
|
1858 vec![], |
50245
dbe09fb038fc
rhg: remember the inode of .hg/dirstate
Raphaël Gomès <rgomes@octobus.net>
parents:
50243
diff
changeset
|
1859 None, |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1860 )?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1861 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1862 // Check that everything is accounted for |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1863 assert!(map.contains_key(p(b"some/nested/added"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1864 assert!(map.contains_key(p(b"some/nested/removed"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1865 assert!(map.contains_key(p(b"merged"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1866 assert!(map.contains_key(p(b"other/p2_info_only"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1867 assert!(map.contains_key(p(b"other/added_with_p2"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1868 assert!(map.contains_key(p(b"some/other/nested/clean"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1869 assert_eq!( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1870 map.copy_map_get(p(b"some/nested/added"))?, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1871 Some(p(b"added_copy_source")) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1872 ); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1873 assert_eq!( |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1874 map.copy_map_get(p(b"other/p2_info_only"))?, |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1875 Some(p(b"other/p2_info_copy_source")) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1876 ); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1877 assert_eq!(tracked_descendants(&map, b"some"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1878 assert_eq!(descendants_with_an_entry(&map, b"some"), 3); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1879 assert_eq!(tracked_descendants(&map, b"other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1880 assert_eq!(descendants_with_an_entry(&map, b"other"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1881 assert_eq!(tracked_descendants(&map, b"some/other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1882 assert_eq!(descendants_with_an_entry(&map, b"some/other"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1883 assert_eq!(tracked_descendants(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1884 assert_eq!(descendants_with_an_entry(&map, b"some/other/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1885 assert_eq!(tracked_descendants(&map, b"some/nested"), 1); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1886 assert_eq!(descendants_with_an_entry(&map, b"some/nested"), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1887 assert_eq!(map.len(), 6); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1888 assert_eq!(map.get_map().unreachable_bytes, 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1889 assert_eq!(map.copy_map_len(), 2); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1890 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1891 // Shouldn't change anything since it's already not tracked |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1892 map.set_untracked(p(b"some/nested/removed"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1893 assert_eq!(map.get_map().unreachable_bytes, 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1894 |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1895 if let ChildNodes::InMemory(_) = map.get_map().root { |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1896 panic!("root should not have been mutated") |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1897 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1898 // We haven't mutated enough (nothing, actually), we should still be in |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1899 // the append strategy |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1900 assert!(map.get_map().write_should_append()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1901 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1902 // But this mutates the structure, so there should be unreachable_bytes |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1903 assert!(map.set_untracked(p(b"some/nested/added"))?); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1904 let unreachable_bytes = map.get_map().unreachable_bytes; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1905 assert!(unreachable_bytes > 0); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1906 |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1907 if let ChildNodes::OnDisk(_) = map.get_map().root { |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1908 panic!("root should have been mutated") |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1909 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1910 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1911 // This should not mutate the structure either, since `root` has |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1912 // already been mutated along with its direct children. |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1913 map.set_untracked(p(b"merged"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1914 assert_eq!(map.get_map().unreachable_bytes, unreachable_bytes); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1915 |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1916 if let NodeRef::InMemory(_, _) = |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1917 map.get_map().get_node(p(b"other/added_with_p2"))?.unwrap() |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1918 { |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1919 panic!("'other/added_with_p2' should not have been mutated") |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1920 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1921 // But this should, since it's in a different path |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1922 // than `<root>some/nested/add` |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1923 map.set_untracked(p(b"other/added_with_p2"))?; |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1924 assert!(map.get_map().unreachable_bytes > unreachable_bytes); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1925 |
49930
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1926 if let NodeRef::OnDisk(_) = |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1927 map.get_map().get_node(p(b"other/added_with_p2"))?.unwrap() |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1928 { |
e98fd81bb151
rust-clippy: fix most warnings in `hg-core`
Raphaël Gomès <rgomes@octobus.net>
parents:
49924
diff
changeset
|
1929 panic!("'other/added_with_p2' should have been mutated") |
49126
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1930 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1931 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1932 // We have rewritten most of the tree, we should create a new file |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1933 assert!(!map.get_map().write_should_append()); |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1934 |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1935 Ok(()) |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1936 } |
e7b74bb602a4
rust-dirstatemap: add unit tests
Raphaël Gomès <rgomes@octobus.net>
parents:
49125
diff
changeset
|
1937 } |