mercurial-scm/hg: rust/hg-core/src/repo.rs annotate

annotate rust/hg-core/src/repo.rs @ 51616:b08c5fbe0e70 stable

rust: blanket implementation of Graph for Graph references The need comes from the fact that `AncestorsIterator` and many Graph-related algorithms take ownership of the `Graph` they work with. This, in turn is due to them needing to accept the `Index` instances that are provided by the Python layers (that neither rhg nor `RHGitaly` use, of course): the fact that nowadays the Python layer holds an object that is itself implemented in Rust does not change the core problem that they cannot be tracked by the borrow checker. Even though it looks like cloning `Changelog` would be cheap, it seems hard to guarantee that on the long run. The object is already too rich for us to be comfortable with it, when using references is the most natural and guaranteed way of proceeding. The added test seems a bit superfleous, but it will act as a reminder that this feature is really useful until something in the Mercurial code base actually uses it.

author	Georges Racinet <georges.racinet@octobus.net>
date	Mon, 22 Apr 2024 19:47:08 +0200
parents	13f58ce70299
children	69b804c8e09e

rev	line source
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	1 use crate::changelog::Changelog;
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	2 use crate::config::{Config, ConfigError, ConfigParseError};
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	3 use crate::dirstate::DirstateParents;
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	4 use crate::dirstate_tree::dirstate_map::DirstateMapWriteMode;
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	5 use crate::dirstate_tree::on_disk::Docket as DirstateDocket;
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	6 use crate::dirstate_tree::owning::OwningDirstateMap;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	7 use crate::errors::HgResultExt;
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	8 use crate::errors::{HgError, IoResultExt};
48417 5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	9 use crate::lock::{try_with_lock_no_wait, LockError};
47960 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47959 diff changeset	10 use crate::manifest::{Manifest, Manifestlog};
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	11 use crate::requirements::{
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	12 CHANGELOGV2_REQUIREMENT, GENERALDELTA_REQUIREMENT, NODEMAP_REQUIREMENT,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	13 REVLOGV1_REQUIREMENT, REVLOGV2_REQUIREMENT,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	14 };
47961 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47960 diff changeset	15 use crate::revlog::filelog::Filelog;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	16 use crate::revlog::RevlogError;
50228 fc8e37c380d3 dirstate: add a synchronisation point before doing a full dirstate read Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50227 diff changeset	17 use crate::utils::debug::debug_wait_for_file_or_print;
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	18 use crate::utils::files::get_path_from_bytes;
47961 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47960 diff changeset	19 use crate::utils::hg_path::HgPath;
46740 97ac588b6d9e rhg: Don?t make repository path absolute too early Simon Sapin <simon.sapin@octobus.net> parents: 46735 diff changeset	20 use crate::utils::SliceExt;
47952 9cd35c8c6044 rust: Move VFS code to its own module Simon Sapin <simon.sapin@octobus.net> parents: 47949 diff changeset	21 use crate::vfs::{is_dir, is_file, Vfs};
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	22 use crate::{
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	23 requirements, NodePrefix, RevlogVersionOptions, UncheckedRevision,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	24 };
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	25 use crate::{DirstateError, RevlogOpenOptions};
48419 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	26 use std::cell::{Ref, RefCell, RefMut};
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	27 use std::collections::HashSet;
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	28 use std::io::Seek;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	29 use std::io::SeekFrom;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	30 use std::io::Write as IoWrite;
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	31 use std::path::{Path, PathBuf};
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	32
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	33 const V2_MAX_READ_ATTEMPTS: usize = 5;
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	34
50252 a6b8b1ab9116 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49937 50245 diff changeset	35 type DirstateMapIdentity = (Option<u64>, Option<Vec<u8>>, usize);
a6b8b1ab9116 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49937 50245 diff changeset	36
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	37 /// A repository on disk
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	38 pub struct Repo {
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	39 working_directory: PathBuf,
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	40 dot_hg: PathBuf,
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	41 store: PathBuf,
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	42 requirements: HashSet<String>,
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	43 config: Config,
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	44 dirstate_parents: LazyCell<DirstateParents>,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	45 dirstate_map: LazyCell<OwningDirstateMap>,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	46 changelog: LazyCell<Changelog>,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	47 manifestlog: LazyCell<Manifestlog>,
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	48 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	49
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	50 #[derive(Debug, derive_more::From)]
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	51 pub enum RepoError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	52 NotFound {
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	53 at: PathBuf,
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	54 },
1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	55 #[from]
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	56 ConfigParseError(ConfigParseError),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	57 #[from]
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	58 Other(HgError),
1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	59 }
1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	60
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	61 impl From<ConfigError> for RepoError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	62 fn from(error: ConfigError) -> Self {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	63 match error {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	64 ConfigError::Parse(error) => error.into(),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	65 ConfigError::Other(error) => error.into(),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	66 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	67 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	68 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	69
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	70 impl Repo {
47405 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	71 /// tries to find nearest repository root in current working directory or
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	72 /// its ancestors
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	73 pub fn find_repo_root() -> Result<PathBuf, RepoError> {
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	74 let current_directory = crate::utils::current_dir()?;
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	75 // ancestors() is inclusive: it first yields `current_directory`
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	76 // as-is.
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	77 for ancestor in current_directory.ancestors() {
47780 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	78 if is_dir(ancestor.join(".hg"))? {
47405 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	79 return Ok(ancestor.to_path_buf());
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	80 }
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	81 }
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	82 Err(RepoError::NotFound {
47405 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	83 at: current_directory,
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	84 })
47405 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	85 }
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	86
46505 a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	87 /// Find a repository, either at the given path (which must contain a `.hg`
a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	88 /// sub-directory) or by searching the current directory and its
a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	89 /// ancestors.
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	90 ///
46505 a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	91 /// A method with two very different "modes" like this usually a code smell
a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	92 /// to make two methods instead, but in this case an `Option` is what rhg
a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	93 /// sub-commands get from Clap for the `-R` / `--repository` CLI argument.
a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	94 /// Having two methods would just move that `if` to almost all callers.
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	95 pub fn find(
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	96 config: &Config,
47404 ebdef6283798 rhg: read [paths] for `--repository` value Pulkit Goyal <7895pulkit@gmail.com> parents: 47374 diff changeset	97 explicit_path: Option<PathBuf>,
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	98 ) -> Result<Self, RepoError> {
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	99 if let Some(root) = explicit_path {
47780 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	100 if is_dir(root.join(".hg"))? {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	101 Self::new_at_path(root, config)
47780 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	102 } else if is_file(&root)? {
46730 dfd35823635b rhg: Fall back to Python for bundle repositories Simon Sapin <simon.sapin@octobus.net> parents: 46728 diff changeset	103 Err(HgError::unsupported("bundle repository").into())
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	104 } else {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	105 Err(RepoError::NotFound { at: root })
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	106 }
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	107 } else {
47405 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	108 let root = Self::find_repo_root()?;
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47404 diff changeset	109 Self::new_at_path(root, config)
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	110 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	111 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	112
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	113 /// To be called after checking that `.hg` is a sub-directory
46485 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	114 fn new_at_path(
f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	115 working_directory: PathBuf,
f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	116 config: &Config,
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	117 ) -> Result<Self, RepoError> {
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	118 let dot_hg = working_directory.join(".hg");
46463 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	119
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	120 let mut repo_config_files =
e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	121 vec![dot_hg.join("hgrc"), dot_hg.join("hgrc-not-shared")];
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	122
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	123 let hg_vfs = Vfs { base: &dot_hg };
46463 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	124 let mut reqs = requirements::load_if_exists(hg_vfs)?;
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	125 let relative =
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	126 reqs.contains(requirements::RELATIVE_SHARED_REQUIREMENT);
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	127 let shared =
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	128 reqs.contains(requirements::SHARED_REQUIREMENT) \|\| relative;
46463 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	129
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	130 // From `mercurial/localrepo.py`:
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	131 //
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	132 // if .hg/requires contains the sharesafe requirement, it means
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	133 // there exists a `.hg/store/requires` too and we should read it
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	134 // NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	135 // is present. We never write SHARESAFE_REQUIREMENT for a repo if store
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	136 // is not present, refer checkrequirementscompat() for that
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	137 //
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	138 // However, if SHARESAFE_REQUIREMENT is not present, it means that the
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	139 // repository was shared the old way. We check the share source
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	140 // .hg/requires for SHARESAFE_REQUIREMENT to detect whether the
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	141 // current repository needs to be reshared
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	142 let share_safe = reqs.contains(requirements::SHARESAFE_REQUIREMENT);
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	143
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	144 let store_path;
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	145 if !shared {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	146 store_path = dot_hg.join("store");
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	147 } else {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	148 let bytes = hg_vfs.read("sharedpath")?;
46669 e8cd519a0a34 rhg: Ignore trailing newlines in .hg/sharedpath Simon Sapin <simon.sapin@octobus.net> parents: 46613 diff changeset	149 let mut shared_path =
47949 696abab107b4 rust: Generalize the `trim_end_newlines` utility of byte strings Simon Sapin <simon.sapin@octobus.net> parents: 47780 diff changeset	150 get_path_from_bytes(bytes.trim_end_matches(\|b\| b == b'\n'))
696abab107b4 rust: Generalize the `trim_end_newlines` utility of byte strings Simon Sapin <simon.sapin@octobus.net> parents: 47780 diff changeset	151 .to_owned();
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	152 if relative {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	153 shared_path = dot_hg.join(shared_path)
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	154 }
47780 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	155 if !is_dir(&shared_path)? {
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	156 return Err(HgError::corrupted(format!(
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	157 ".hg/sharedpath points to nonexistent directory {}",
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	158 shared_path.display()
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	159 ))
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	160 .into());
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	161 }
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	162
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	163 store_path = shared_path.join("store");
46463 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	164
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	165 let source_is_share_safe =
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	166 requirements::load(Vfs { base: &shared_path })?
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	167 .contains(requirements::SHARESAFE_REQUIREMENT);
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	168
48809 1d5fd9def5ac rhg: simplify the handling of share-safe config mismatch Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48510 diff changeset	169 if share_safe != source_is_share_safe {
1d5fd9def5ac rhg: simplify the handling of share-safe config mismatch Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48510 diff changeset	170 return Err(HgError::unsupported("share-safe mismatch").into());
46463 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46462 diff changeset	171 }
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	172
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	173 if share_safe {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	174 repo_config_files.insert(0, shared_path.join("hgrc"))
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	175 }
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	176 }
46613 f64b6953db70 rhg: Bug fix: with share-safe, always read store requirements Simon Sapin <simon.sapin@octobus.net> parents: 46601 diff changeset	177 if share_safe {
f64b6953db70 rhg: Bug fix: with share-safe, always read store requirements Simon Sapin <simon.sapin@octobus.net> parents: 46601 diff changeset	178 reqs.extend(requirements::load(Vfs { base: &store_path })?);
f64b6953db70 rhg: Bug fix: with share-safe, always read store requirements Simon Sapin <simon.sapin@octobus.net> parents: 46601 diff changeset	179 }
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	180
46741 25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46740 diff changeset	181 let repo_config = if std::env::var_os("HGRCSKIPREPO").is_none() {
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46740 diff changeset	182 config.combine_with_repo(&repo_config_files)?
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46740 diff changeset	183 } else {
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46740 diff changeset	184 config.clone()
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46740 diff changeset	185 };
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	186
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	187 let repo = Self {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	188 requirements: reqs,
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	189 working_directory,
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	190 store: store_path,
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	191 dot_hg,
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	192 config: repo_config,
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	193 dirstate_parents: LazyCell::new(),
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	194 dirstate_map: LazyCell::new(),
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	195 changelog: LazyCell::new(),
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	196 manifestlog: LazyCell::new(),
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	197 };
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	198
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	199 requirements::check(&repo)?;
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	200
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	201 Ok(repo)
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	202 }
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	203
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	204 pub fn working_directory_path(&self) -> &Path {
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	205 &self.working_directory
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	206 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	207
46462 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	208 pub fn requirements(&self) -> &HashSet<String> {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	209 &self.requirements
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	210 }
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	211
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	212 pub fn config(&self) -> &Config {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	213 &self.config
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	214 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46485 diff changeset	215
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	216 /// For accessing repository files (in `.hg`), except for the store
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	217 /// (`.hg/store`).
46599 1f55cd5b292f rust: Add a log file rotation utility Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	218 pub fn hg_vfs(&self) -> Vfs<'_> {
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	219 Vfs { base: &self.dot_hg }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	220 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	221
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	222 /// For accessing repository store files (in `.hg/store`)
46599 1f55cd5b292f rust: Add a log file rotation utility Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	223 pub fn store_vfs(&self) -> Vfs<'_> {
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	224 Vfs { base: &self.store }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	225 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	226
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	227 /// For accessing the working copy
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: 46741 diff changeset	228 pub fn working_directory_vfs(&self) -> Vfs<'_> {
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	229 Vfs {
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	230 base: &self.working_directory,
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	231 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	232 }
46601 755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46599 diff changeset	233
48417 5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	234 pub fn try_with_wlock_no_wait<R>(
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	235 &self,
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	236 f: impl FnOnce() -> R,
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	237 ) -> Result<R, LockError> {
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	238 try_with_lock_no_wait(self.hg_vfs(), "wlock", f)
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	239 }
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	240
50655 1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	241 /// Whether this repo should use dirstate-v2.
1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	242 /// The presence of `dirstate-v2` in the requirements does not mean that
1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	243 /// the on-disk dirstate is necessarily in version 2. In most cases,
1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	244 /// a dirstate-v2 file will indeed be found, but in rare cases (like the
1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	245 /// upgrade mechanism being cut short), the on-disk version will be a
1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	246 /// v1 file.
50657 bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	247 /// Semantically, having a requirement only means that a client cannot
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	248 /// properly understand or properly update the repo if it lacks the support
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	249 /// for the required feature, but not that that feature is actually used
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	250 /// in all occasions.
50655 1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	251 pub fn use_dirstate_v2(&self) -> bool {
47374 bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	252 self.requirements
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	253 .contains(requirements::DIRSTATE_V2_REQUIREMENT)
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	254 }
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	255
48409 005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	256 pub fn has_sparse(&self) -> bool {
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	257 self.requirements.contains(requirements::SPARSE_REQUIREMENT)
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	258 }
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	259
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	260 pub fn has_narrow(&self) -> bool {
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	261 self.requirements.contains(requirements::NARROW_REQUIREMENT)
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	262 }
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48069 diff changeset	263
49091 9b5334c1e499 rust-repo: extract a function for checking nodemap requirement Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	264 pub fn has_nodemap(&self) -> bool {
9b5334c1e499 rust-repo: extract a function for checking nodemap requirement Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	265 self.requirements
9b5334c1e499 rust-repo: extract a function for checking nodemap requirement Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	266 .contains(requirements::NODEMAP_REQUIREMENT)
9b5334c1e499 rust-repo: extract a function for checking nodemap requirement Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	267 }
9b5334c1e499 rust-repo: extract a function for checking nodemap requirement Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	268
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	269 fn dirstate_file_contents(&self) -> Result<Vec<u8>, HgError> {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	270 Ok(self
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	271 .hg_vfs()
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	272 .read("dirstate")
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	273 .io_not_found_as_none()?
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	274 .unwrap_or_default())
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	275 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	276
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	277 fn dirstate_identity(&self) -> Result<Option<u64>, HgError> {
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	278 use std::os::unix::fs::MetadataExt;
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	279 Ok(self
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	280 .hg_vfs()
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	281 .symlink_metadata("dirstate")
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	282 .io_not_found_as_none()?
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	283 .map(\|meta\| meta.ino()))
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	284 }
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	285
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	286 pub fn dirstate_parents(&self) -> Result<DirstateParents, HgError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	287 Ok(*self
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	288 .dirstate_parents
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	289 .get_or_init(\|\| self.read_dirstate_parents())?)
48419 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	290 }
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	291
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	292 fn read_dirstate_parents(&self) -> Result<DirstateParents, HgError> {
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	293 let dirstate = self.dirstate_file_contents()?;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	294 let parents = if dirstate.is_empty() {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	295 DirstateParents::NULL
50655 1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	296 } else if self.use_dirstate_v2() {
50657 bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	297 let docket_res =
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	298 crate::dirstate_tree::on_disk::read_docket(&dirstate);
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	299 match docket_res {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	300 Ok(docket) => docket.parents(),
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	301 Err(_) => {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	302 log::info!(
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	303 "Parsing dirstate docket failed, \
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	304 falling back to dirstate-v1"
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	305 );
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	306 *crate::dirstate::parsers::parse_dirstate_parents(
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	307 &dirstate,
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	308 )?
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	309 }
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	310 }
47374 bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	311 } else {
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49217 diff changeset	312 *crate::dirstate::parsers::parse_dirstate_parents(&dirstate)?
47374 bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	313 };
48419 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	314 self.dirstate_parents.set(parents);
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47407 diff changeset	315 Ok(parents)
46601 755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46599 diff changeset	316 }
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	317
50244 07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	318 /// Returns the information read from the dirstate docket necessary to
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	319 /// check if the data file has been updated/deleted by another process
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	320 /// since we last read the dirstate.
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	321 /// Namely, the inode, data file uuid and the data size.
50244 07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	322 fn get_dirstate_data_file_integrity(
48420 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	323 &self,
50252 a6b8b1ab9116 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49937 50245 diff changeset	324 ) -> Result<DirstateMapIdentity, HgError> {
48420 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	325 assert!(
50655 1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	326 self.use_dirstate_v2(),
48420 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	327 "accessing dirstate data file ID without dirstate-v2"
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	328 );
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	329 // Get the identity before the contents since we could have a race
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	330 // between the two. Having an identity that is too old is fine, but
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	331 // one that is younger than the content change is bad.
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	332 let identity = self.dirstate_identity()?;
48420 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	333 let dirstate = self.dirstate_file_contents()?;
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	334 if dirstate.is_empty() {
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	335 self.dirstate_parents.set(DirstateParents::NULL);
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	336 Ok((identity, None, 0))
48420 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	337 } else {
50657 bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	338 let docket_res =
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	339 crate::dirstate_tree::on_disk::read_docket(&dirstate);
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	340 match docket_res {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	341 Ok(docket) => {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	342 self.dirstate_parents.set(docket.parents());
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	343 Ok((
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	344 identity,
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	345 Some(docket.uuid.to_owned()),
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	346 docket.data_size(),
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	347 ))
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	348 }
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	349 Err(_) => {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	350 log::info!(
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	351 "Parsing dirstate docket failed, \
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	352 falling back to dirstate-v1"
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	353 );
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	354 let parents =
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	355 *crate::dirstate::parsers::parse_dirstate_parents(
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	356 &dirstate,
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	357 )?;
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	358 self.dirstate_parents.set(parents);
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	359 Ok((identity, None, 0))
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	360 }
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	361 }
48420 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	362 }
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	363 }
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48419 diff changeset	364
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	365 fn new_dirstate_map(&self) -> Result<OwningDirstateMap, DirstateError> {
50655 1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	366 if self.use_dirstate_v2() {
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	367 // The v2 dirstate is split into a docket and a data file.
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	368 // Since we don't always take the `wlock` to read it
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	369 // (like in `hg status`), it is susceptible to races.
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	370 // A simple retry method should be enough since full rewrites
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	371 // only happen when too much garbage data is present and
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	372 // this race is unlikely.
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	373 let mut tries = 0;
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	374
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	375 while tries < V2_MAX_READ_ATTEMPTS {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	376 tries += 1;
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	377 match self.read_docket_and_data_file() {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	378 Ok(m) => {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	379 return Ok(m);
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	380 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	381 Err(e) => match e {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	382 DirstateError::Common(HgError::RaceDetected(
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	383 context,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	384 )) => {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	385 log::info!(
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	386 "dirstate read race detected {} (retry {}/{})",
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	387 context,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	388 tries,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	389 V2_MAX_READ_ATTEMPTS,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	390 );
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	391 continue;
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	392 }
50657 bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	393 _ => {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	394 log::info!(
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	395 "Reading dirstate v2 failed, \
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	396 falling back to v1"
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	397 );
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	398 return self.new_dirstate_map_v1();
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	399 }
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	400 },
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	401 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	402 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	403 let error = HgError::abort(
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	404 format!("dirstate read race happened {tries} times in a row"),
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	405 255,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	406 None,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	407 );
50252 a6b8b1ab9116 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49937 50245 diff changeset	408 Err(DirstateError::Common(error))
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	409 } else {
50657 bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	410 self.new_dirstate_map_v1()
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	411 }
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	412 }
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	413
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	414 fn new_dirstate_map_v1(&self) -> Result<OwningDirstateMap, DirstateError> {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	415 debug_wait_for_file_or_print(self.config(), "dirstate.pre-read-file");
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	416 let identity = self.dirstate_identity()?;
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	417 let dirstate_file_contents = self.dirstate_file_contents()?;
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	418 if dirstate_file_contents.is_empty() {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	419 self.dirstate_parents.set(DirstateParents::NULL);
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	420 Ok(OwningDirstateMap::new_empty(Vec::new()))
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	421 } else {
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	422 let (map, parents) =
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	423 OwningDirstateMap::new_v1(dirstate_file_contents, identity)?;
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	424 self.dirstate_parents.set(parents);
bf16ef96defe rust-dirstate: fall back to v1 if reading v2 failed Rapha?l Gom?s <rgomes@octobus.net> parents: 50655 diff changeset	425 Ok(map)
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	426 }
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	427 }
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	428
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	429 fn read_docket_and_data_file(
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	430 &self,
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	431 ) -> Result<OwningDirstateMap, DirstateError> {
50228 fc8e37c380d3 dirstate: add a synchronisation point before doing a full dirstate read Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50227 diff changeset	432 debug_wait_for_file_or_print(self.config(), "dirstate.pre-read-file");
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	433 let dirstate_file_contents = self.dirstate_file_contents()?;
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	434 let identity = self.dirstate_identity()?;
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	435 if dirstate_file_contents.is_empty() {
48419 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	436 self.dirstate_parents.set(DirstateParents::NULL);
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	437 return Ok(OwningDirstateMap::new_empty(Vec::new()));
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	438 }
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	439 let docket = crate::dirstate_tree::on_disk::read_docket(
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	440 &dirstate_file_contents,
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	441 )?;
50234 2be6d5782728 dirstate: add a synchronisation point in the middle of the read Rapha?l Gom?s <rgomes@octobus.net> parents: 50228 diff changeset	442 debug_wait_for_file_or_print(
2be6d5782728 dirstate: add a synchronisation point in the middle of the read Rapha?l Gom?s <rgomes@octobus.net> parents: 50228 diff changeset	443 self.config(),
2be6d5782728 dirstate: add a synchronisation point in the middle of the read Rapha?l Gom?s <rgomes@octobus.net> parents: 50228 diff changeset	444 "dirstate.post-docket-read-file",
2be6d5782728 dirstate: add a synchronisation point in the middle of the read Rapha?l Gom?s <rgomes@octobus.net> parents: 50228 diff changeset	445 );
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	446 self.dirstate_parents.set(docket.parents());
50243 6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50239 diff changeset	447 let uuid = docket.uuid.to_owned();
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	448 let data_size = docket.data_size();
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	449
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	450 let context = "between reading dirstate docket and data file";
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	451 let race_error = HgError::RaceDetected(context.into());
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	452 let metadata = docket.tree_metadata();
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	453
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	454 let mut map = if crate::vfs::is_on_nfs_mount(docket.data_filename()) {
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	455 // Don't mmap on NFS to prevent `SIGBUS` error on deletion
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	456 let contents = self.hg_vfs().read(docket.data_filename());
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	457 let contents = match contents {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	458 Ok(c) => c,
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	459 Err(HgError::IoError { error, context }) => {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	460 match error.raw_os_error().expect("real os error") {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	461 // 2 = ENOENT, No such file or directory
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	462 // 116 = ESTALE, Stale NFS file handle
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	463 //
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	464 // TODO match on `error.kind()` when
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	465 // `ErrorKind::StaleNetworkFileHandle` is stable.
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	466 2 \| 116 => {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	467 // Race where the data file was deleted right after
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	468 // we read the docket, try again
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	469 return Err(race_error.into());
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	470 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	471 _ => {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	472 return Err(
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	473 HgError::IoError { error, context }.into()
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	474 )
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	475 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	476 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	477 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	478 Err(e) => return Err(e.into()),
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	479 };
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	480 OwningDirstateMap::new_v2(
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	481 contents, data_size, metadata, uuid, identity,
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	482 )
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	483 } else {
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	484 match self
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	485 .hg_vfs()
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	486 .mmap_open(docket.data_filename())
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	487 .io_not_found_as_none()
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	488 {
50243 6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50239 diff changeset	489 Ok(Some(data_mmap)) => OwningDirstateMap::new_v2(
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	490 data_mmap, data_size, metadata, uuid, identity,
50243 6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50239 diff changeset	491 ),
50239 491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	492 Ok(None) => {
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	493 // Race where the data file was deleted right after we
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	494 // read the docket, try again
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	495 return Err(race_error.into());
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	496 }
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	497 Err(e) => return Err(e.into()),
491f3dd080eb dirstate: deal with read-race for pure rust code path (rhg) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50234 diff changeset	498 }
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	499 }?;
50222 ecd28d89c29e dirstate-v2: add devel config option to control write behavior Rapha?l Gom?s <rgomes@octobus.net> parents: 50221 diff changeset	500
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	501 let write_mode_config = self
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	502 .config()
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	503 .get_str(b"devel", b"dirstate.v2.data_update_mode")
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	504 .unwrap_or(Some("auto"))
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	505 .unwrap_or("auto"); // don't bother for devel options
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	506 let write_mode = match write_mode_config {
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	507 "auto" => DirstateMapWriteMode::Auto,
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	508 "force-new" => DirstateMapWriteMode::ForceNewDataFile,
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	509 "force-append" => DirstateMapWriteMode::ForceAppend,
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	510 _ => DirstateMapWriteMode::Auto,
cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	511 };
50222 ecd28d89c29e dirstate-v2: add devel config option to control write behavior Rapha?l Gom?s <rgomes@octobus.net> parents: 50221 diff changeset	512
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	513 map.with_dmap_mut(\|m\| m.set_write_mode(write_mode));
50222 ecd28d89c29e dirstate-v2: add devel config option to control write behavior Rapha?l Gom?s <rgomes@octobus.net> parents: 50221 diff changeset	514
50227 cbd4c9234e25 rust-repo: move dirstate-v2 opening to a separate method Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	515 Ok(map)
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	516 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	517
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	518 pub fn dirstate_map(
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	519 &self,
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	520 ) -> Result<Ref<OwningDirstateMap>, DirstateError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	521 self.dirstate_map.get_or_init(\|\| self.new_dirstate_map())
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	522 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	523
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	524 pub fn dirstate_map_mut(
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	525 &self,
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	526 ) -> Result<RefMut<OwningDirstateMap>, DirstateError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	527 self.dirstate_map
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	528 .get_mut_or_init(\|\| self.new_dirstate_map())
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	529 }
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	530
49090 a5ef50becea8 rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo` Martin von Zweigbergk <martinvonz@google.com> parents: 49005 diff changeset	531 fn new_changelog(&self) -> Result<Changelog, HgError> {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	532 Changelog::open(&self.store_vfs(), self.default_revlog_options(true)?)
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	533 }
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	534
47963 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47961 diff changeset	535 pub fn changelog(&self) -> Result<Ref<Changelog>, HgError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	536 self.changelog.get_or_init(\|\| self.new_changelog())
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	537 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	538
47963 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47961 diff changeset	539 pub fn changelog_mut(&self) -> Result<RefMut<Changelog>, HgError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	540 self.changelog.get_mut_or_init(\|\| self.new_changelog())
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	541 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	542
49090 a5ef50becea8 rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo` Martin von Zweigbergk <martinvonz@google.com> parents: 49005 diff changeset	543 fn new_manifestlog(&self) -> Result<Manifestlog, HgError> {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	544 Manifestlog::open(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	545 &self.store_vfs(),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	546 self.default_revlog_options(false)?,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	547 )
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	548 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	549
47963 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47961 diff changeset	550 pub fn manifestlog(&self) -> Result<Ref<Manifestlog>, HgError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	551 self.manifestlog.get_or_init(\|\| self.new_manifestlog())
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	552 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	553
47963 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47961 diff changeset	554 pub fn manifestlog_mut(&self) -> Result<RefMut<Manifestlog>, HgError> {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	555 self.manifestlog.get_mut_or_init(\|\| self.new_manifestlog())
47959 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47958 diff changeset	556 }
47960 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47959 diff changeset	557
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	558 /// Returns the manifest of the changeset with the given node ID
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	559 pub fn manifest_for_node(
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	560 &self,
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	561 node: impl Into<NodePrefix>,
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	562 ) -> Result<Manifest, RevlogError> {
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	563 self.manifestlog()?.data_for_node(
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	564 self.changelog()?
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	565 .data_for_node(node.into())?
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	566 .manifest_node()?
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	567 .into(),
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	568 )
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	569 }
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	570
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	571 /// Returns the manifest of the changeset with the given revision number
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	572 pub fn manifest_for_rev(
47960 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47959 diff changeset	573 &self,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50657 diff changeset	574 revision: UncheckedRevision,
47960 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47959 diff changeset	575 ) -> Result<Manifest, RevlogError> {
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	576 self.manifestlog()?.data_for_node(
87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	577 self.changelog()?
87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	578 .data_for_rev(revision)?
87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	579 .manifest_node()?
87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	580 .into(),
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	581 )
47960 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47959 diff changeset	582 }
47961 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47960 diff changeset	583
48510 7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	584 pub fn has_subrepos(&self) -> Result<bool, DirstateError> {
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	585 if let Some(entry) = self.dirstate_map()?.get(HgPath::new(".hgsub"))? {
49136 3f5e207f78be rust: use `entry.tracked()` directly Rapha?l Gom?s <rgomes@octobus.net> parents: 49091 diff changeset	586 Ok(entry.tracked())
48510 7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	587 } else {
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	588 Ok(false)
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	589 }
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	590 }
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48421 diff changeset	591
47963 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47961 diff changeset	592 pub fn filelog(&self, path: &HgPath) -> Result<Filelog, HgError> {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	593 Filelog::open(self, path, self.default_revlog_options(false)?)
47961 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47960 diff changeset	594 }
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	595
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	596 /// Write to disk any updates that were made through `dirstate_map_mut`.
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	597 ///
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	598 /// The "wlock" must be held while calling this.
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	599 /// See for example `try_with_wlock_no_wait`.
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	600 ///
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	601 /// TODO: have a `WritableRepo` type only accessible while holding the
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	602 /// lock?
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	603 pub fn write_dirstate(&self) -> Result<(), DirstateError> {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	604 let map = self.dirstate_map()?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	605 // TODO: Maintain a `DirstateMap::dirty` flag, and return early here if
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	606 // it’s unset
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	607 let parents = self.dirstate_parents()?;
50655 1e2c6cda2309 rust-dirstate: rename `has_dirstate_v2` to `use_dirstate_v2` Rapha?l Gom?s <rgomes@octobus.net> parents: 50252 diff changeset	608 let (packed_dirstate, old_uuid_to_remove) = if self.use_dirstate_v2() {
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	609 let (identity, uuid, data_size) =
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	610 self.get_dirstate_data_file_integrity()?;
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	611 let identity_changed = identity != map.old_identity();
50244 07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	612 let uuid_changed = uuid.as_deref() != map.old_uuid();
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	613 let data_length_changed = data_size != map.old_data_size();
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	614
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	615 if identity_changed \|\| uuid_changed \|\| data_length_changed {
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	616 // If any of identity, uuid or length have changed since
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	617 // last disk read, don't write.
50244 07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	618 // This is fine because either we're in a command that doesn't
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	619 // write anything too important (like `hg status`), or we're in
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	620 // `hg add` and we're supposed to have taken the lock before
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	621 // reading anyway.
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	622 //
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	623 // TODO complain loudly if we've changed anything important
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	624 // without taking the lock.
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	625 // (see `hg help config.format.use-dirstate-tracked-hint`)
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	626 log::debug!(
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	627 "dirstate has changed since last read, not updating."
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	628 );
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	629 return Ok(());
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	630 }
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	631
07d030b38097 rust-dirstate-v2: don't write dirstate if data file has changed Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	632 let uuid_opt = map.old_uuid();
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	633 let write_mode = if uuid_opt.is_some() {
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	634 DirstateMapWriteMode::Auto
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	635 } else {
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	636 DirstateMapWriteMode::ForceNewDataFile
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	637 };
49145 dd2503a63d33 rust-dirstate-v2: save proper data size if no new data on append Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	638 let (data, tree_metadata, append, old_data_size) =
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50211 diff changeset	639 map.pack_v2(write_mode)?;
49150 f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	640
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	641 // Reuse the uuid, or generate a new one, keeping the old for
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	642 // deletion.
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	643 let (uuid, old_uuid) = match uuid_opt {
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	644 Some(uuid) => {
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	645 let as_str = std::str::from_utf8(uuid)
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	646 .map_err(\|_\| {
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	647 HgError::corrupted(
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	648 "non-UTF-8 dirstate data file ID",
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	649 )
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	650 })?
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	651 .to_owned();
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	652 if append {
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	653 (as_str, None)
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	654 } else {
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	655 (DirstateDocket::new_uid(), Some(as_str))
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	656 }
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	657 }
f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	658 None => (DirstateDocket::new_uid(), None),
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	659 };
49150 f2ef6a4f918f rhg: fix dirstate-v2 data file removal system Rapha?l Gom?s <rgomes@octobus.net> parents: 49146 diff changeset	660
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	661 let data_filename = format!("dirstate.{}", uuid);
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	662 let data_filename = self.hg_vfs().join(data_filename);
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	663 let mut options = std::fs::OpenOptions::new();
49202 2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	664 options.write(true);
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	665
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	666 // Why are we not using the O_APPEND flag when appending?
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	667 //
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	668 // - O_APPEND makes it trickier to deal with garbage at the end of
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	669 // the file, left by a previous uncommitted transaction. By
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	670 // starting the write at [old_data_size] we make sure we erase
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	671 // all such garbage.
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	672 //
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	673 // - O_APPEND requires to special-case 0-byte writes, whereas we
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	674 // don't need that.
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	675 //
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	676 // - Some OSes have bugs in implementation O_APPEND:
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	677 // revlog.py talks about a Solaris bug, but we also saw some ZFS
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	678 // bug: https://github.com/openzfs/zfs/pull/3124,
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	679 // https://github.com/openzfs/zfs/issues/13370
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	680 //
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	681 if !append {
50211 f5e4248e5bce dirstate: add some debug output when writing the dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50180 diff changeset	682 log::trace!("creating a new dirstate data file");
49202 2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	683 options.create_new(true);
50211 f5e4248e5bce dirstate: add some debug output when writing the dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50180 diff changeset	684 } else {
f5e4248e5bce dirstate: add some debug output when writing the dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50180 diff changeset	685 log::trace!("appending to the dirstate data file");
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	686 }
49202 2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	687
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	688 let data_size = (\|\| {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	689 // TODO: loop and try another random ID if !append and this
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	690 // returns `ErrorKind::AlreadyExists`? Collision chance of two
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	691 // random IDs is one in 2**32
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	692 let mut file = options.open(&data_filename)?;
49202 2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	693 if append {
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	694 file.seek(SeekFrom::Start(old_data_size as u64))?;
49145 dd2503a63d33 rust-dirstate-v2: save proper data size if no new data on append Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	695 }
49202 2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	696 file.write_all(&data)?;
2d0e22171ef9 rhg: align the dirstate v2 writing algorithm with python Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49150 diff changeset	697 file.flush()?;
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	698 file.stream_position()
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	699 })()
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	700 .when_writing_file(&data_filename)?;
49146 802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	701
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	702 let packed_dirstate = DirstateDocket::serialize(
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	703 parents,
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	704 tree_metadata,
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	705 data_size,
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	706 uuid.as_bytes(),
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	707 )
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	708 .map_err(\|_: std::num::TryFromIntError\| {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	709 HgError::corrupted("overflow in dirstate docket serialization")
49146 802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	710 })?;
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	711
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	712 (packed_dirstate, old_uuid)
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	713 } else {
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	714 let identity = self.dirstate_identity()?;
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	715 if identity != map.old_identity() {
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	716 // If identity changed since last disk read, don't write.
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	717 // This is fine because either we're in a command that doesn't
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	718 // write anything too important (like `hg status`), or we're in
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	719 // `hg add` and we're supposed to have taken the lock before
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	720 // reading anyway.
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	721 //
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	722 // TODO complain loudly if we've changed anything important
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	723 // without taking the lock.
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	724 // (see `hg help config.format.use-dirstate-tracked-hint`)
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	725 log::debug!(
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	726 "dirstate has changed since last read, not updating."
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	727 );
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	728 return Ok(());
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50244 diff changeset	729 }
49146 802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	730 (map.pack_v1(parents)?, None)
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	731 };
49146 802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	732
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	733 let vfs = self.hg_vfs();
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	734 vfs.atomic_write("dirstate", &packed_dirstate)?;
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	735 if let Some(uuid) = old_uuid_to_remove {
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	736 // Remove the old data file after the new docket pointing to the
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	737 // new data file was written.
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	738 vfs.remove_file(format!("dirstate.{}", uuid))?;
802e2c25dab8 rust-dirstate-v2: clean up previous data file after the docket is written Rapha?l Gom?s <rgomes@octobus.net> parents: 49145 diff changeset	739 }
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	740 Ok(())
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48420 diff changeset	741 }
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	742
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	743 pub fn default_revlog_options(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	744 &self,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	745 changelog: bool,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	746 ) -> Result<RevlogOpenOptions, HgError> {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	747 let requirements = self.requirements();
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	748 let version = if changelog
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	749 && requirements.contains(CHANGELOGV2_REQUIREMENT)
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	750 {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	751 let compute_rank = self
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	752 .config()
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	753 .get_bool(b"experimental", b"changelog-v2.compute-rank")?;
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	754 RevlogVersionOptions::ChangelogV2 { compute_rank }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	755 } else if requirements.contains(REVLOGV2_REQUIREMENT) {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	756 RevlogVersionOptions::V2
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	757 } else if requirements.contains(REVLOGV1_REQUIREMENT) {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	758 RevlogVersionOptions::V1 {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	759 generaldelta: requirements.contains(GENERALDELTA_REQUIREMENT),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	760 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	761 } else {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	762 RevlogVersionOptions::V0
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	763 };
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	764 Ok(RevlogOpenOptions {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	765 version,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	766 // We don't need to dance around the slow path like in the Python
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	767 // implementation since we know we have access to the fast code.
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	768 use_nodemap: requirements.contains(NODEMAP_REQUIREMENT),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	769 })
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	770 }
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	771 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	772
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	773 /// Lazily-initialized component of `Repo` with interior mutability
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	774 ///
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	775 /// This differs from `OnceCell` in that the value can still be "deinitialized"
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	776 /// later by setting its inner `Option` to `None`. It also takes the
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	777 /// initialization function as an argument when the value is requested, not
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	778 /// when the instance is created.
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	779 struct LazyCell<T> {
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	780 value: RefCell<Option<T>>,
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	781 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	782
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	783 impl<T> LazyCell<T> {
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	784 fn new() -> Self {
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	785 Self {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	786 value: RefCell::new(None),
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	787 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	788 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	789
48419 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	790 fn set(&self, value: T) {
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	791 *self.value.borrow_mut() = Some(value)
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	792 }
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48417 diff changeset	793
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	794 fn get_or_init<E>(
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	795 &self,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	796 init: impl Fn() -> Result<T, E>,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	797 ) -> Result<Ref<T>, E> {
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	798 let mut borrowed = self.value.borrow();
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	799 if borrowed.is_none() {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	800 drop(borrowed);
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	801 // Only use `borrow_mut` if it is really needed to avoid panic in
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	802 // case there is another outstanding borrow but mutation is not
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	803 // needed.
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	804 *self.value.borrow_mut() = Some(init()?);
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	805 borrowed = self.value.borrow()
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	806 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	807 Ok(Ref::map(borrowed, \|option\| option.as_ref().unwrap()))
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	808 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	809
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	810 fn get_mut_or_init<E>(
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	811 &self,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	812 init: impl Fn() -> Result<T, E>,
90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	813 ) -> Result<RefMut<T>, E> {
47958 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	814 let mut borrowed = self.value.borrow_mut();
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	815 if borrowed.is_none() {
49177 90a15199cbc6 rust-repo: make `Send` by not storing functions in `LazyCell` Martin von Zweigbergk <martinvonz@google.com> parents: 49164 diff changeset	816 *borrowed = Some(init()?);
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	817 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	818 Ok(RefMut::map(borrowed, \|option\| option.as_mut().unwrap()))
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47952 diff changeset	819 }
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	820 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/repo.rs @ 51616:b08c5fbe0e70 stable