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

annotate rust/hg-core/src/dirstate_tree/dispatch.rs @ 47521:abed645b8e96

dirstate: move the handling of special case within the dirstatemap The dirstatemap is as well, if not better, suited to decided how to encode the various case. So we move the associated code in the dirstatemap `addfile` method. This means the dirstate no longer need to know about the various magic value used in the dirstate V1 format. The pain of the messy API start to be quite palpable in Rust, we should clean this up once the current large refactoring is dealt with. Differential Revision: https://phab.mercurial-scm.org/D10963

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sun, 04 Jul 2021 20:23:19 +0200
parents	eaae39894312
children	69a463a4f193

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::EntryState;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	14 use crate::PatternFileWarning;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	15 use crate::StateMapIter;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	16 use crate::StatusError;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	17 use crate::StatusOptions;
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	18
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	19 /// `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	20 /// `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	21 /// 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	22 /// 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	23 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	24 /// 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	25 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	26 /// * `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	27 /// 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	28 /// fields.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	29 /// * `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	30 /// 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	31 /// 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	32 /// 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	33 /// abstracted in this trait.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	34 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	35 /// 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	36 /// 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	37 pub trait DirstateMapMethods {
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	38 /// 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	39 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	40
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	41 /// 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	42 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	43 /// `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	44 /// 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	45 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	46 /// `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	47 fn add_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	48 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	49 filename: &HgPath,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	50 old_state: EntryState,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	51 entry: DirstateEntry,
47521 abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	52 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	53 possibly_dirty: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	54 ) -> Result<(), DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	55
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	56 /// 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	57 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	58 /// `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	59 /// 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	60 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	61 /// `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	62 /// 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	63 fn remove_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	64 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	65 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	66 in_merge: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	67 ) -> Result<(), DirstateError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	68
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	69 /// 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	70 /// whether there was any.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	71 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	72 /// `get` will now return `None` for this filename.
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 /// `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	75 /// before this call, or `EntryState::Unknown` if there was no such entry.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	76 fn drop_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	77 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	78 filename: &HgPath,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	79 old_state: EntryState,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	80 ) -> 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	81
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	82 /// 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	83 /// (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	84 /// timestamp.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	85 fn clear_ambiguous_times(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	86 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	87 filenames: Vec<HgPathBuf>,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	88 now: i32,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	89 ) -> Result<(), DirstateV2ParseError>;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	90
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	91 /// 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	92 /// 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	93 /// `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	94 fn non_normal_entries_contains(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	95 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	96 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	97 ) -> Result<bool, DirstateV2ParseError>;
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	98
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	99 /// 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	100 /// 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	101 /// up to date.
47122 e3cebe96c0fc dirstate-tree: Add "non normal" and "from other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47115 diff changeset	102 fn non_normal_entries_remove(&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	103
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	104 /// 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	105 /// "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	106 /// parent".
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	107 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	108 /// 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	109 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	110 /// "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	111 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	112 /// 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	113 /// are `Result`s.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	114 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	115 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	116 ) -> 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	117
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	118 /// 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	119 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	120 /// 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	121 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	122
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	123 /// 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	124 /// (see `non_normal_entries_contains`).
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	125 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	126 /// 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	127 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	128 /// 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	129 /// are `Result`s.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	130 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	131 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	132 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	133 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	134 >;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	135
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	136 /// 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	137 /// self`.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	138 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	139 /// 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	140 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	141 &self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	142 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	143 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	144 >;
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	145
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	146 /// 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	147 /// parent".
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	148 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	149 /// 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	150 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	151 /// "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	152 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	153 /// 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	154 /// are `Result`s.
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	155 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	156 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	157 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	158 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	159 >;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	160
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	161 /// 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	162 /// tracked file.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	163 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	164 /// 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	165 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	166 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	167 directory: &HgPath,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	168 ) -> 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	169
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	170 /// 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	171 /// 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	172 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	173
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	174 /// 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	175 /// `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	176 /// 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	177 /// 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	178 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	179 &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	180 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	181 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	182 ) -> 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	183
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	184 /// 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	185 /// `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	186 /// serialize bytes to write the `.hg/dirstate` file to disk in dirstate-v2
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	187 /// format.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	188 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	189 /// Note: this is only supported by the tree dirstate map.
47291 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	190 fn pack_v2(
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	191 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	192 parents: DirstateParents,
47115 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47108 diff changeset	193 now: Timestamp,
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	194 ) -> 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	195
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	196 /// Run the status algorithm.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	197 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	198 /// 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	199 /// 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	200 /// 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	201 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	202 &'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	203 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	204 root_dir: PathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	205 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	206 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	207 ) -> 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	208
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	209 /// 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	210 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	211
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	212 /// 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	213 /// copy source.
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	214 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	215
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	216 /// 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	217 fn copy_map_contains_key(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	218 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	219 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	220 ) -> 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	221
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	222 /// 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	223 fn copy_map_get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	224 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	225 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	226 ) -> 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	227
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	228 /// 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	229 /// it.
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	230 fn copy_map_remove(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	231 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	232 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	233 ) -> 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	234
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	235 /// 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	236 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	237 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	238 key: HgPathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	239 value: HgPathBuf,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	240 ) -> 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	241
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	242 /// 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	243 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	244
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	245 /// 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	246 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	247 -> 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	248
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	249 /// 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	250 fn get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	251 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	252 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	253 ) -> 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	254
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	255 /// 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	256 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	257 /// 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	258 /// 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	259 fn iter(&self) -> StateMapIter<'_>;
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	260
47496 8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	261 /// In the tree dirstate, return an iterator of "directory" (entry-less)
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	262 /// nodes with the data stored for them. This is for `hg debugdirstate
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	263 /// --dirs`.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	264 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	265 /// In the flat dirstate, returns an empty iterator.
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	266 ///
8851acad5906 rust: Document the DirstateMapMethods trait Simon Sapin <simon.sapin@octobus.net> parents: 47482 diff changeset	267 /// 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	268 /// are `Result`s.
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	269 fn iter_directories(
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	270 &self,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	271 ) -> Box<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	272 dyn Iterator<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	273 Item = Result<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	274 (&HgPath, Option<Timestamp>),
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	275 DirstateV2ParseError,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	276 >,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	277 > + Send
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	278 + '_,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	279 >;
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	280 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	281
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	282 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	283 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	284 self.clear()
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	285 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	286
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	287 fn add_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	288 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	289 filename: &HgPath,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	290 old_state: EntryState,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	291 entry: DirstateEntry,
47521 abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	292 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	293 possibly_dirty: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	294 ) -> Result<(), DirstateError> {
47521 abed645b8e96 dirstate: move the handling of special case within the dirstatemap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	295 self.add_file(filename, old_state, entry, 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	296 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	297
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	298 fn remove_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	299 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	300 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	301 in_merge: bool,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	302 ) -> 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	303 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	304 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	305
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	306 fn drop_file(
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	307 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	308 filename: &HgPath,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	309 old_state: EntryState,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	310 ) -> 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	311 self.drop_file(filename, old_state)
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
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	314 fn clear_ambiguous_times(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	315 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	316 filenames: Vec<HgPathBuf>,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	317 now: i32,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	318 ) -> Result<(), DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	319 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	320 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	321
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	322 fn non_normal_entries_contains(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	323 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	324 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	325 ) -> Result<bool, DirstateV2ParseError> {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	326 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	327 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	328 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	329 }
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	330
47122 e3cebe96c0fc dirstate-tree: Add "non normal" and "from other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47115 diff changeset	331 fn non_normal_entries_remove(&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	332 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	333 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	334
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	335 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	336 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	337 ) -> 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	338 {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	339 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	340 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	341 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	342 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	343
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	344 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	345 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	346 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	347
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	348 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	349 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	350 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	351 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	352 > {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	353 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	354 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	355 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	356 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	357
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	358 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	359 &self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	360 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	361 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	362 > {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	363 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	364 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	365 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	366 }
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	367
e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	368 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	369 &mut self,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	370 ) -> Box<
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	371 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	372 > {
47108 e061a1df32a8 dirstate-tree: Abstract "non-normal" and "other parent" sets Simon Sapin <simon.sapin@octobus.net> parents: 47107 diff changeset	373 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	374 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	375 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	376 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	377
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	378 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	379 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	380 directory: &HgPath,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	381 ) -> 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	382 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	383 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	384
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	385 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	386 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	387 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	388
47291 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	389 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	390 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	391 parents: DirstateParents,
47115 5d62243c7732 rust: Add a Timestamp struct instead of abusing Duration Simon Sapin <simon.sapin@octobus.net> parents: 47108 diff changeset	392 now: Timestamp,
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	393 ) -> 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	394 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	395 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	396
47291 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	397 fn pack_v2(
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	398 &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	399 _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	400 _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	401 ) -> 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	402 panic!(
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	403 "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	404 )
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	405 }
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47138 diff changeset	406
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	407 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	408 &'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	409 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	410 root_dir: PathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	411 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	412 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	413 ) -> 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	414 {
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	415 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	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 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	419 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	420 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	421
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	422 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	423 Box::new(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	424 self.copy_map
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	425 .iter()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	426 .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	427 )
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	428 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	429
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	430 fn copy_map_contains_key(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	431 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	432 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	433 ) -> Result<bool, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	434 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	435 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	436
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	437 fn copy_map_get(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	438 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	439 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	440 ) -> Result<Option<&HgPath>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	441 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	442 }
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	443
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	444 fn copy_map_remove(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	445 &mut self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	446 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	447 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	448 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	449 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	450
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	451 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	452 &mut self,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	453 key: HgPathBuf,
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	454 value: HgPathBuf,
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	455 ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	456 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	457 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	458
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	459 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	460 (&**self).len()
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
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	463 fn contains_key(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	464 &self,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	465 key: &HgPath,
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	466 ) -> Result<bool, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	467 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	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 get(
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<Option<DirstateEntry>, DirstateV2ParseError> {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	474 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	475 }
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	476
787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	477 fn iter(&self) -> StateMapIter<'_> {
47343 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47340 diff changeset	478 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	479 }
47357 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	480
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	481 fn iter_directories(
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	482 &self,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	483 ) -> Box<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	484 dyn Iterator<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	485 Item = Result<
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	486 (&HgPath, Option<Timestamp>),
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	487 DirstateV2ParseError,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	488 >,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	489 > + Send
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	490 + '_,
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	491 > {
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	492 Box::new(std::iter::empty())
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47343 diff changeset	493 }
47107 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	494 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/dirstate_tree/dispatch.rs @ 47521:abed645b8e96