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

annotate rust/hg-core/src/dirstate_tree/dispatch.rs @ 48048:1b2ee68e85f9

rust: Remove EntryState::Unknown This enum variant represented the `state == '?'` case, which was used to represent the absence of a dirstate entry/item (and therefore of that entry?s state). Now that previous refactors have removed this use in the Python/Rust FFI APIs, the remaining uses can be removed by replacing `EntryState` by `Option<EntryState>` where appropriate, using `None` to represent the absence of an entry. Differential Revision: https://phab.mercurial-scm.org/D11465

author	Simon Sapin <simon.sapin@octobus.net>
date	Mon, 20 Sep 2021 20:55:38 +0200
parents	357307feaf61
children	32ef647821b2

rev	line source
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	1 use std::path::PathBuf;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	2
47115 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47108 diff changeset	3 use crate::dirstate::parsers::Timestamp;
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	4 use crate::dirstate_tree::on_disk::DirstateV2ParseError;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	5 use crate::matchers::Matcher;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	6 use crate::utils::hg_path::{HgPath, HgPathBuf};
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	7 use crate::CopyMapIter;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	8 use crate::DirstateEntry;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	9 use crate::DirstateError;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	10 use crate::DirstateMap;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	11 use crate::DirstateParents;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	12 use crate::DirstateStatus;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	13 use crate::PatternFileWarning;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	14 use crate::StateMapIter;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	15 use crate::StatusError;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	16 use crate::StatusOptions;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	17
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	18 /// `rust/hg-cpython/src/dirstate/dirstate_map.rs` implements in Rust a
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	19 /// `DirstateMap` Python class that wraps `Box<dyn DirstateMapMethods + Send>`,
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	20 /// a trait object of this trait. Except for constructors, this trait defines
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	21 /// all APIs that the class needs to interact with its inner dirstate map.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	22 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	23 /// A trait object is used to support two different concrete types:
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	24 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	25 /// * `rust/hg-core/src/dirstate/dirstate_map.rs` defines the "flat dirstate
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	26 /// map" which is based on a few large `HgPath`-keyed `HashMap` and `HashSet`
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	27 /// fields.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	28 /// * `rust/hg-core/src/dirstate_tree/dirstate_map.rs` defines the "tree
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	29 /// dirstate map" based on a tree data struture with nodes for directories
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	30 /// containing child nodes for their files and sub-directories. This tree
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	31 /// enables a more efficient algorithm for `hg status`, but its details are
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	32 /// abstracted in this trait.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	33 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	34 /// The dirstate map associates paths of files in the working directory to
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	35 /// various information about the state of those files.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	36 pub trait DirstateMapMethods {
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	37 /// Remove information about all files in this map
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	38 fn clear(&mut self);
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	39
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	40 fn set_v1(&mut self, filename: &HgPath, entry: DirstateEntry);
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	41
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	42 /// Add or change the information associated to a given file.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	43 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	44 /// `old_state` is the state in the entry that `get` would have returned
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	45 /// before this call, or `EntryState::Unknown` if there was no such entry.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	46 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	47 /// `entry.state` should never be `EntryState::Unknown`.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	48 fn add_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	49 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	50 filename: &HgPath,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	51 entry: DirstateEntry,
47525 fe4641cf9b72 dirstate: use a `added` parameter to _addpath Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47524 diff changeset	52 added: bool,
47527 c6b91a9c242a dirstate: use a `merged` parameter to _addpath Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47525 diff changeset	53 merged: bool,
47521 abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	54 from_p2: bool,
abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	55 possibly_dirty: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	56 ) -> Result<(), DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	57
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	58 /// Mark a file as "removed" (as in `hg rm`).
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	59 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	60 /// `old_state` is the state in the entry that `get` would have returned
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	61 /// before this call, or `EntryState::Unknown` if there was no such entry.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	62 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	63 /// `size` is not actually a size but the 0 or -1 or -2 value that would be
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	64 /// put in the size field in the dirstate-v1 format.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	65 fn remove_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	66 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	67 filename: &HgPath,
47511 eaae39894312 dirstate: move most of the `remove` logic with dirstatemap `removefile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47496 diff changeset	68 in_merge: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	69 ) -> Result<(), DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	70
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	71 /// Drop information about this file from the map if any, and return
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	72 /// whether there was any.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	73 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	74 /// `get` will now return `None` for this filename.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	75 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	76 /// `old_state` is the state in the entry that `get` would have returned
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	77 /// before this call, or `EntryState::Unknown` if there was no such entry.
47535 6025353c9c55 dirstate: no longer pass `oldstate` to the `dropfile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47527 diff changeset	78 fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	79
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	80 /// Among given files, mark the stored `mtime` as ambiguous if there is one
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	81 /// (if `state == EntryState::Normal`) equal to the given current Unix
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	82 /// timestamp.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	83 fn clear_ambiguous_times(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	84 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	85 filenames: Vec<HgPathBuf>,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	86 now: i32,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	87 ) -> Result<(), DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	88
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	89 /// Return whether the map has an "non-normal" entry for the given
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	90 /// filename. That is, any entry with a `state` other than
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	91 /// `EntryState::Normal` or with an ambiguous `mtime`.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	92 fn non_normal_entries_contains(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	93 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	94 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	95 ) -> Result<bool, DirstateV2ParseError>;
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	96
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	97 /// Mark the given path as "normal" file. This is only relevant in the flat
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	98 /// dirstate map where there is a separate `HashSet` that needs to be kept
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	99 /// up to date.
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	100 /// Returns whether the key was present in the set.
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	101 fn non_normal_entries_remove(&mut self, key: &HgPath) -> bool;
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	102
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	103 /// Mark the given path as "non-normal" file.
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	104 /// This is only relevant in the flat dirstate map where there is a
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	105 /// separate `HashSet` that needs to be kept up to date.
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	106 fn non_normal_entries_add(&mut self, key: &HgPath);
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	107
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	108 /// Return an iterator of paths whose respective entry are either
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	109 /// "non-normal" (see `non_normal_entries_contains`) or "from other
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	110 /// parent".
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	111 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	112 /// If that information is cached, create the cache as needed.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	113 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	114 /// "From other parent" is defined as `state == Normal && size == -2`.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	115 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	116 /// Because parse errors can happen during iteration, the iterated items
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	117 /// are `Result`s.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	118 fn non_normal_or_other_parent_paths(
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	119 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	120 ) -> Box<dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + '_>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	121
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	122 /// Create the cache for `non_normal_or_other_parent_paths` if needed.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	123 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	124 /// If `force` is true, the cache is re-created even if it already exists.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	125 fn set_non_normal_other_parent_entries(&mut self, force: bool);
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	126
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	127 /// Return an iterator of paths whose respective entry are "non-normal"
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	128 /// (see `non_normal_entries_contains`).
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	129 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	130 /// If that information is cached, create the cache as needed.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	131 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	132 /// Because parse errors can happen during iteration, the iterated items
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	133 /// are `Result`s.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	134 fn iter_non_normal_paths(
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	135 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	136 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	137 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + Send + '_,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	138 >;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	139
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	140 /// Same as `iter_non_normal_paths`, but takes `&self` instead of `&mut
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	141 /// self`.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	142 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	143 /// Panics if a cache is necessary but does not exist yet.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	144 fn iter_non_normal_paths_panic(
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	145 &self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	146 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	147 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + Send + '_,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	148 >;
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	149
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	150 /// Return an iterator of paths whose respective entry are "from other
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	151 /// parent".
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	152 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	153 /// If that information is cached, create the cache as needed.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	154 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	155 /// "From other parent" is defined as `state == Normal && size == -2`.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	156 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	157 /// Because parse errors can happen during iteration, the iterated items
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	158 /// are `Result`s.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	159 fn iter_other_parent_paths(
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	160 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	161 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	162 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + Send + '_,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	163 >;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	164
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	165 /// Returns whether the sub-tree rooted at the given directory contains any
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	166 /// tracked file.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	167 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	168 /// A file is tracked if it has a `state` other than `EntryState::Removed`.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	169 fn has_tracked_dir(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	170 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	171 directory: &HgPath,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	172 ) -> Result<bool, DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	173
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	174 /// Returns whether the sub-tree rooted at the given directory contains any
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	175 /// file with a dirstate entry.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	176 fn has_dir(&mut self, directory: &HgPath) -> Result<bool, DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	177
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	178 /// Clear mtimes that are ambigous with `now` (similar to
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	179 /// `clear_ambiguous_times` but for all files in the dirstate map), and
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	180 /// serialize bytes to write the `.hg/dirstate` file to disk in dirstate-v1
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	181 /// format.
47291 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	182 fn pack_v1(
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	183 &mut self,
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	184 parents: DirstateParents,
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	185 now: Timestamp,
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	186 ) -> Result<Vec<u8>, DirstateError>;
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	187
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	188 /// Clear mtimes that are ambigous with `now` (similar to
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	189 /// `clear_ambiguous_times` but for all files in the dirstate map), and
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	190 /// serialize bytes to write a dirstate data file to disk in dirstate-v2
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	191 /// format.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	192 ///
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	193 /// 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: 47678 diff changeset	194 /// appended to the existing data file whose content is at
78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	195 /// `self.on_disk` (true), instead of written to a new data file
78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	196 /// (false).
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	197 ///
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	198 /// Note: this is only supported by the tree dirstate map.
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	199 fn pack_v2(
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	200 &mut self,
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	201 now: Timestamp,
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	202 can_append: bool,
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	203 ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	204
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	205 /// Run the status algorithm.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	206 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	207 /// This is not sematically a method of the dirstate map, but a different
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	208 /// algorithm is used for the flat v.s. tree dirstate map so having it in
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	209 /// this trait enables the same dynamic dispatch as with other methods.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	210 fn status<'a>(
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	211 &'a mut self,
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	212 matcher: &'a (dyn Matcher + Sync),
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	213 root_dir: PathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	214 ignore_files: Vec<PathBuf>,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	215 options: StatusOptions,
47124 9c6b458a08e1 rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct Simon Sapin <simon.sapin@octobus.net> parents: 47123 diff changeset	216 ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	217
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	218 /// Returns how many files in the dirstate map have a recorded copy source.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	219 fn copy_map_len(&self) -> usize;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	220
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	221 /// Returns an iterator of `(path, copy_source)` for all files that have a
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	222 /// copy source.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	223 fn copy_map_iter(&self) -> CopyMapIter<'_>;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	224
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	225 /// Returns whether the givef file has a copy source.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	226 fn copy_map_contains_key(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	227 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	228 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	229 ) -> Result<bool, DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	230
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	231 /// Returns the copy source for the given file.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	232 fn copy_map_get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	233 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	234 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	235 ) -> Result<Option<&HgPath>, DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	236
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	237 /// Removes the recorded copy source if any for the given file, and returns
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	238 /// it.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	239 fn copy_map_remove(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	240 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	241 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	242 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	243
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	244 /// Set the given `value` copy source for the given `key` file.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	245 fn copy_map_insert(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	246 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	247 key: HgPathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	248 value: HgPathBuf,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	249 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	250
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	251 /// Returns the number of files that have an entry.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	252 fn len(&self) -> usize;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	253
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	254 /// Returns whether the given file has an entry.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	255 fn contains_key(&self, key: &HgPath)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	256 -> Result<bool, DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	257
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	258 /// Returns the entry, if any, for the given file.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	259 fn get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	260 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	261 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	262 ) -> Result<Option<DirstateEntry>, DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	263
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	264 /// Returns a `(path, entry)` iterator of files that have an entry.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	265 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	266 /// Because parse errors can happen during iteration, the iterated items
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	267 /// are `Result`s.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	268 fn iter(&self) -> StateMapIter<'_>;
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	269
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	270 /// Returns an iterator of tracked directories.
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	271 ///
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	272 /// This is the paths for which `has_tracked_dir` would return true.
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	273 /// Or, in other words, the union of ancestor paths of all paths that have
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	274 /// an associated entry in a "tracked" state in this dirstate map.
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	275 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	276 /// Because parse errors can happen during iteration, the iterated items
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	277 /// are `Result`s.
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	278 fn iter_tracked_dirs(
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	279 &mut self,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	280 ) -> Result<
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	281 Box<
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	282 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	283 + Send
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	284 + '_,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	285 >,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	286 DirstateError,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	287 >;
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	288
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	289 /// Return an iterator of `(path, (state, mode, size, mtime))` for every
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	290 /// node stored in this dirstate map, for the purpose of the `hg
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	291 /// debugdirstate` command.
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	292 ///
48045 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	293 /// If `all` is true, include nodes that don’t have an entry.
357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	294 /// For such nodes `state` is the ASCII space.
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	295 /// An `mtime` may still be present. It is used to optimize `status`.
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	296 ///
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	297 /// Because parse errors can happen during iteration, the iterated items
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	298 /// are `Result`s.
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	299 fn debug_iter(
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	300 &self,
48045 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	301 all: bool,
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	302 ) -> Box<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	303 dyn Iterator<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	304 Item = Result<
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	305 (&HgPath, (u8, i32, i32, i32)),
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	306 DirstateV2ParseError,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	307 >,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	308 > + Send
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	309 + '_,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	310 >;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	311 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	312
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	313 impl DirstateMapMethods for DirstateMap {
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	314 fn clear(&mut self) {
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	315 self.clear()
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	316 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	317
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	318 /// Used to set a value directory.
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	319 ///
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	320 /// XXX Is temporary during a refactor of V1 dirstate and will disappear
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	321 /// shortly.
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	322 fn set_v1(&mut self, filename: &HgPath, entry: DirstateEntry) {
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	323 self.set_v1_inner(&filename, entry)
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	324 }
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	325
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	326 fn add_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	327 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	328 filename: &HgPath,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	329 entry: DirstateEntry,
47525 fe4641cf9b72 dirstate: use a `added` parameter to _addpath Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47524 diff changeset	330 added: bool,
47527 c6b91a9c242a dirstate: use a `merged` parameter to _addpath Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47525 diff changeset	331 merged: bool,
47521 abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	332 from_p2: bool,
abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	333 possibly_dirty: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	334 ) -> Result<(), DirstateError> {
47527 c6b91a9c242a dirstate: use a `merged` parameter to _addpath Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47525 diff changeset	335 self.add_file(filename, entry, added, merged, from_p2, possibly_dirty)
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	336 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	337
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	338 fn remove_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	339 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	340 filename: &HgPath,
47511 eaae39894312 dirstate: move most of the `remove` logic with dirstatemap `removefile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47496 diff changeset	341 in_merge: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	342 ) -> Result<(), DirstateError> {
47511 eaae39894312 dirstate: move most of the `remove` logic with dirstatemap `removefile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47496 diff changeset	343 self.remove_file(filename, in_merge)
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	344 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	345
47535 6025353c9c55 dirstate: no longer pass `oldstate` to the `dropfile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47527 diff changeset	346 fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError> {
6025353c9c55 dirstate: no longer pass `oldstate` to the `dropfile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47527 diff changeset	347 self.drop_file(filename)
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	348 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	349
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	350 fn clear_ambiguous_times(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	351 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	352 filenames: Vec<HgPathBuf>,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	353 now: i32,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	354 ) -> Result<(), DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	355 Ok(self.clear_ambiguous_times(filenames, now))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	356 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	357
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	358 fn non_normal_entries_contains(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	359 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	360 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	361 ) -> Result<bool, DirstateV2ParseError> {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	362 let (non_normal, _other_parent) =
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	363 self.get_non_normal_other_parent_entries();
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	364 Ok(non_normal.contains(key))
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	365 }
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	366
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	367 fn non_normal_entries_remove(&mut self, key: &HgPath) -> bool {
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	368 self.non_normal_entries_remove(key)
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	369 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	370
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	371 fn non_normal_entries_add(&mut self, key: &HgPath) {
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	372 self.non_normal_entries_add(key)
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	373 }
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	374
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	375 fn non_normal_or_other_parent_paths(
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	376 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	377 ) -> Box<dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + '_>
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	378 {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	379 let (non_normal, other_parent) =
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	380 self.get_non_normal_other_parent_entries();
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	381 Box::new(non_normal.union(other_parent).map(\|p\| Ok(&**p)))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	382 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	383
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	384 fn set_non_normal_other_parent_entries(&mut self, force: bool) {
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	385 self.set_non_normal_other_parent_entries(force)
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	386 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	387
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	388 fn iter_non_normal_paths(
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	389 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	390 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	391 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + Send + '_,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	392 > {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	393 let (non_normal, _other_parent) =
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	394 self.get_non_normal_other_parent_entries();
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	395 Box::new(non_normal.iter().map(\|p\| Ok(&**p)))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	396 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	397
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	398 fn iter_non_normal_paths_panic(
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	399 &self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	400 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	401 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + Send + '_,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	402 > {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	403 let (non_normal, _other_parent) =
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	404 self.get_non_normal_other_parent_entries_panic();
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	405 Box::new(non_normal.iter().map(\|p\| Ok(&**p)))
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	406 }
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	407
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	408 fn iter_other_parent_paths(
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	409 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	410 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	411 dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + Send + '_,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	412 > {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	413 let (_non_normal, other_parent) =
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	414 self.get_non_normal_other_parent_entries();
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	415 Box::new(other_parent.iter().map(\|p\| Ok(&**p)))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	416 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	417
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	418 fn has_tracked_dir(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	419 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	420 directory: &HgPath,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	421 ) -> Result<bool, DirstateError> {
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	422 self.has_tracked_dir(directory)
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	423 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	424
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	425 fn has_dir(&mut self, directory: &HgPath) -> Result<bool, DirstateError> {
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	426 self.has_dir(directory)
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	427 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	428
47291 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	429 fn pack_v1(
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	430 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	431 parents: DirstateParents,
47115 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47108 diff changeset	432 now: Timestamp,
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	433 ) -> Result<Vec<u8>, DirstateError> {
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	434 self.pack(parents, now)
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	435 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	436
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	437 fn pack_v2(
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	438 &mut self,
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	439 _now: Timestamp,
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	440 _can_append: bool,
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	441 ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> {
47291 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	442 panic!(
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	443 "should have used dirstate_tree::DirstateMap to use the v2 format"
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	444 )
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	445 }
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	446
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	447 fn status<'a>(
47126 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	448 &'a mut self,
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	449 matcher: &'a (dyn Matcher + Sync),
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	450 root_dir: PathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	451 ignore_files: Vec<PathBuf>,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	452 options: StatusOptions,
47124 9c6b458a08e1 rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct Simon Sapin <simon.sapin@octobus.net> parents: 47123 diff changeset	453 ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>
9c6b458a08e1 rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct Simon Sapin <simon.sapin@octobus.net> parents: 47123 diff changeset	454 {
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	455 crate::status(self, matcher, root_dir, ignore_files, options)
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	456 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	457
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	458 fn copy_map_len(&self) -> usize {
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	459 self.copy_map.len()
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	460 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	461
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	462 fn copy_map_iter(&self) -> CopyMapIter<'_> {
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	463 Box::new(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	464 self.copy_map
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	465 .iter()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	466 .map(\|(key, value)\| Ok((&key, &value))),
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	467 )
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	468 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	469
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	470 fn copy_map_contains_key(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	471 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	472 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	473 ) -> Result<bool, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	474 Ok(self.copy_map.contains_key(key))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	475 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	476
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	477 fn copy_map_get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	478 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	479 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	480 ) -> Result<Option<&HgPath>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	481 Ok(self.copy_map.get(key).map(\|p\| &**p))
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	482 }
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	483
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	484 fn copy_map_remove(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	485 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	486 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	487 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	488 Ok(self.copy_map.remove(key))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	489 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	490
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	491 fn copy_map_insert(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	492 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	493 key: HgPathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	494 value: HgPathBuf,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	495 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	496 Ok(self.copy_map.insert(key, value))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	497 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	498
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	499 fn len(&self) -> usize {
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	500 (&**self).len()
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	501 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	502
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	503 fn contains_key(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	504 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	505 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	506 ) -> Result<bool, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	507 Ok((&**self).contains_key(key))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	508 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	509
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	510 fn get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	511 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	512 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	513 ) -> Result<Option<DirstateEntry>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	514 Ok((&**self).get(key).cloned())
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	515 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	516
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	517 fn iter(&self) -> StateMapIter<'_> {
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	518 Box::new((&self).iter().map(\|(key, value)\| Ok((&key, *value))))
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	519 }
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	520
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	521 fn iter_tracked_dirs(
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	522 &mut self,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	523 ) -> Result<
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	524 Box<
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	525 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	526 + Send
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	527 + '_,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	528 >,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	529 DirstateError,
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	530 > {
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	531 self.set_all_dirs()?;
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	532 Ok(Box::new(
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	533 self.all_dirs
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	534 .as_ref()
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	535 .unwrap()
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	536 .iter()
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	537 .map(\|path\| Ok(&**path)),
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	538 ))
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	539 }
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	540
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	541 fn debug_iter(
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	542 &self,
48045 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	543 all: bool,
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	544 ) -> Box<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	545 dyn Iterator<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	546 Item = Result<
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	547 (&HgPath, (u8, i32, i32, i32)),
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	548 DirstateV2ParseError,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	549 >,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	550 > + Send
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	551 + '_,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	552 > {
48045 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	553 // Not used for the flat (not tree-based) DirstateMap
357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	554 let _ = all;
357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	555
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	556 Box::new(
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	557 (&**self)
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	558 .iter()
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	559 .map(\|(path, entry)\| Ok((&**path, entry.debug_tuple()))),
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	560 )
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	561 }
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	562 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/dirstate_tree/dispatch.rs @ 48048:1b2ee68e85f9