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

annotate rust/hg-core/src/repo.rs @ 48807:59be65b7cdfd stable

rust-hg-core: use correct type for libc hostname buffer The type of libc::c_char is u8 on aarch64 rather than i8, which causes the use of a specifically-typed constant to fail. Differential Revision: https://phab.mercurial-scm.org/D12373

author	Luke Granger-Brown <hg@lukegb.com>
date	Mon, 14 Mar 2022 14:10:41 +0000
parents	7f633432ca92
children	dd6b67d5c256 1d5fd9def5ac

rev	line source
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	1 use crate::changelog::Changelog;
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	2 use crate::config::{Config, ConfigError, ConfigParseError};
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	3 use crate::dirstate::DirstateParents;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	4 use crate::dirstate_tree::dirstate_map::DirstateMap;
48467 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	5 use crate::dirstate_tree::on_disk::Docket as DirstateDocket;
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 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: 47980 diff changeset	7 use crate::errors::HgResultExt;
48467 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	8 use crate::errors::{HgError, IoResultExt};
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	9 use crate::exit_codes;
48463 5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	10 use crate::lock::{try_with_lock_no_wait, LockError};
47988 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	11 use crate::manifest::{Manifest, Manifestlog};
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47988 diff changeset	12 use crate::revlog::filelog::Filelog;
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	13 use crate::revlog::revlog::RevlogError;
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	14 use crate::utils::files::get_path_from_bytes;
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47988 diff changeset	15 use crate::utils::hg_path::HgPath;
46753 97ac588b6d9e rhg: Don?t make repository path absolute too early Simon Sapin <simon.sapin@octobus.net> parents: 46748 diff changeset	16 use crate::utils::SliceExt;
47980 9cd35c8c6044 rust: Move VFS code to its own module Simon Sapin <simon.sapin@octobus.net> parents: 47977 diff changeset	17 use crate::vfs::{is_dir, is_file, Vfs};
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	18 use crate::{requirements, NodePrefix};
47988 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	19 use crate::{DirstateError, Revision};
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	20 use std::cell::{Ref, RefCell, RefMut};
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	21 use std::collections::HashSet;
48467 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	22 use std::io::Seek;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	23 use std::io::SeekFrom;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	24 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	25 use std::path::{Path, PathBuf};
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	26
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	27 /// A repository on disk
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	28 pub struct Repo {
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	29 working_directory: PathBuf,
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	30 dot_hg: PathBuf,
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	31 store: PathBuf,
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	32 requirements: HashSet<String>,
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	33 config: Config,
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	34 dirstate_parents: LazyCell<DirstateParents, HgError>,
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	35 dirstate_data_file_uuid: LazyCell<Option<Vec<u8>>, HgError>,
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	36 dirstate_map: LazyCell<OwningDirstateMap, DirstateError>,
47991 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	37 changelog: LazyCell<Changelog, HgError>,
001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	38 manifestlog: LazyCell<Manifestlog, HgError>,
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	39 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	40
46514 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	41 #[derive(Debug, derive_more::From)]
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	42 pub enum RepoError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	43 NotFound {
46555 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	44 at: PathBuf,
46514 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	45 },
1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	46 #[from]
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	47 ConfigParseError(ConfigParseError),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	48 #[from]
46514 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	49 Other(HgError),
1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	50 }
1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	51
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	52 impl From<ConfigError> for RepoError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	53 fn from(error: ConfigError) -> Self {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	54 match error {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	55 ConfigError::Parse(error) => error.into(),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	56 ConfigError::Other(error) => error.into(),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	57 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	58 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	59 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	60
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	61 impl Repo {
47411 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	62 /// 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: 47410 diff changeset	63 /// its ancestors
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	64 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: 47410 diff changeset	65 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: 47410 diff changeset	66 // 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: 47410 diff changeset	67 // as-is.
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	68 for ancestor in current_directory.ancestors() {
47779 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	69 if is_dir(ancestor.join(".hg"))? {
47411 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	70 return Ok(ancestor.to_path_buf());
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	71 }
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	72 }
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	73 return Err(RepoError::NotFound {
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	74 at: current_directory,
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	75 });
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	76 }
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	77
46557 a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46555 diff changeset	78 /// 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: 46555 diff changeset	79 /// 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: 46555 diff changeset	80 /// ancestors.
46555 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	81 ///
46557 a25033eb43b5 rhg: add limited support for the `config` sub-command Simon Sapin <simon.sapin@octobus.net> parents: 46555 diff changeset	82 /// 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: 46555 diff changeset	83 /// 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: 46555 diff changeset	84 /// 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: 46555 diff changeset	85 /// Having two methods would just move that `if` to almost all callers.
46555 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	86 pub fn find(
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	87 config: &Config,
47410 ebdef6283798 rhg: read [paths] for `--repository` value Pulkit Goyal <7895pulkit@gmail.com> parents: 47380 diff changeset	88 explicit_path: Option<PathBuf>,
46555 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	89 ) -> Result<Self, RepoError> {
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	90 if let Some(root) = explicit_path {
47779 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	91 if is_dir(root.join(".hg"))? {
46753 97ac588b6d9e rhg: Don?t make repository path absolute too early Simon Sapin <simon.sapin@octobus.net> parents: 46748 diff changeset	92 Self::new_at_path(root.to_owned(), config)
47779 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	93 } else if is_file(&root)? {
46743 dfd35823635b rhg: Fall back to Python for bundle repositories Simon Sapin <simon.sapin@octobus.net> parents: 46741 diff changeset	94 Err(HgError::unsupported("bundle repository").into())
46555 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	95 } else {
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	96 Err(RepoError::NotFound {
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	97 at: root.to_owned(),
d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	98 })
46514 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46511 diff changeset	99 }
46555 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46545 diff changeset	100 } else {
47411 88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	101 let root = Self::find_repo_root()?;
88119fffecc8 rhg: look for repository in ancestors also instead of cwd only Pulkit Goyal <7895pulkit@gmail.com> parents: 47410 diff changeset	102 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	103 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	104 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	105
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	106 /// To be called after checking that `.hg` is a sub-directory
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	107 fn new_at_path(
f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	108 working_directory: PathBuf,
f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	109 config: &Config,
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	110 ) -> Result<Self, RepoError> {
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	111 let dot_hg = working_directory.join(".hg");
46525 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	112
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	113 let mut repo_config_files = Vec::new();
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	114 repo_config_files.push(dot_hg.join("hgrc"));
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	115 repo_config_files.push(dot_hg.join("hgrc-not-shared"));
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	116
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	117 let hg_vfs = Vfs { base: &dot_hg };
46525 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	118 let mut reqs = requirements::load_if_exists(hg_vfs)?;
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	119 let relative =
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	120 reqs.contains(requirements::RELATIVE_SHARED_REQUIREMENT);
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	121 let shared =
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	122 reqs.contains(requirements::SHARED_REQUIREMENT) \|\| relative;
46525 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	123
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	124 // From `mercurial/localrepo.py`:
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	125 //
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	126 // if .hg/requires contains the sharesafe requirement, it means
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	127 // 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: 46524 diff changeset	128 // NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	129 // 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: 46524 diff changeset	130 // is not present, refer checkrequirementscompat() for that
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	131 //
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	132 // 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: 46524 diff changeset	133 // 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: 46524 diff changeset	134 // .hg/requires for SHARESAFE_REQUIREMENT to detect whether the
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	135 // current repository needs to be reshared
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	136 let share_safe = reqs.contains(requirements::SHARESAFE_REQUIREMENT);
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	137
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	138 let store_path;
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	139 if !shared {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	140 store_path = dot_hg.join("store");
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	141 } else {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	142 let bytes = hg_vfs.read("sharedpath")?;
46708 e8cd519a0a34 rhg: Ignore trailing newlines in .hg/sharedpath Simon Sapin <simon.sapin@octobus.net> parents: 46652 diff changeset	143 let mut shared_path =
47977 696abab107b4 rust: Generalize the `trim_end_newlines` utility of byte strings Simon Sapin <simon.sapin@octobus.net> parents: 47779 diff changeset	144 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: 47779 diff changeset	145 .to_owned();
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	146 if relative {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	147 shared_path = dot_hg.join(shared_path)
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	148 }
47779 cf5f8da2244c rhg: Propagate permission errors when finding a repository Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	149 if !is_dir(&shared_path)? {
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	150 return Err(HgError::corrupted(format!(
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	151 ".hg/sharedpath points to nonexistent directory {}",
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	152 shared_path.display()
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	153 ))
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	154 .into());
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	155 }
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	156
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	157 store_path = shared_path.join("store");
46525 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	158
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	159 let source_is_share_safe =
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	160 requirements::load(Vfs { base: &shared_path })?
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	161 .contains(requirements::SHARESAFE_REQUIREMENT);
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	162
95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	163 if share_safe && !source_is_share_safe {
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	164 return Err(match config
46748 12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	165 .get(b"share", b"safe-mismatch.source-not-safe")
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	166 {
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	167 Some(b"abort") \| None => HgError::abort(
46748 12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	168 "abort: share source does not support share-safe requirement\n\
12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	169 (see `hg help config.format.use-share-safe` for more information)",
47413 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 47411 diff changeset	170 exit_codes::ABORT,
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	171 ),
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	172 _ => HgError::unsupported("share-safe downgrade"),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	173 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	174 .into());
46525 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	175 } else if source_is_share_safe && !share_safe {
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	176 return Err(
46748 12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	177 match config.get(b"share", b"safe-mismatch.source-safe") {
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	178 Some(b"abort") \| None => HgError::abort(
46748 12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	179 "abort: version mismatch: source uses share-safe \
12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	180 functionality while the current share does not\n\
12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46743 diff changeset	181 (see `hg help config.format.use-share-safe` for more information)",
47413 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 47411 diff changeset	182 exit_codes::ABORT,
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	183 ),
f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	184 _ => HgError::unsupported("share-safe upgrade"),
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	185 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	186 .into(),
46544 f031fe1c6ede rhg: Abort based on config on share-safe mismatch Simon Sapin <simon.sapin@octobus.net> parents: 46543 diff changeset	187 );
46525 95b276283b67 rhg: add support for share-safe Simon Sapin <simon.sapin@octobus.net> parents: 46524 diff changeset	188 }
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	189
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	190 if share_safe {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	191 repo_config_files.insert(0, shared_path.join("hgrc"))
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	192 }
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	193 }
46652 f64b6953db70 rhg: Bug fix: with share-safe, always read store requirements Simon Sapin <simon.sapin@octobus.net> parents: 46640 diff changeset	194 if share_safe {
f64b6953db70 rhg: Bug fix: with share-safe, always read store requirements Simon Sapin <simon.sapin@octobus.net> parents: 46640 diff changeset	195 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: 46640 diff changeset	196 }
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	197
46754 25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46753 diff changeset	198 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: 46753 diff changeset	199 config.combine_with_repo(&repo_config_files)?
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46753 diff changeset	200 } else {
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46753 diff changeset	201 config.clone()
25e3dac511f0 rhg: Add support for the HGRCSKIPREPO environment variable Simon Sapin <simon.sapin@octobus.net> parents: 46753 diff changeset	202 };
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	203
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	204 let repo = Self {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	205 requirements: reqs,
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	206 working_directory,
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	207 store: store_path,
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	208 dot_hg,
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	209 config: repo_config,
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	210 dirstate_parents: LazyCell::new(Self::read_dirstate_parents),
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	211 dirstate_data_file_uuid: LazyCell::new(
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	212 Self::read_dirstate_data_file_uuid,
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	213 ),
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	214 dirstate_map: LazyCell::new(Self::new_dirstate_map),
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	215 changelog: LazyCell::new(Changelog::open),
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	216 manifestlog: LazyCell::new(Manifestlog::open),
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	217 };
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	218
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	219 requirements::check(&repo)?;
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	220
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	221 Ok(repo)
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	222 }
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	223
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	224 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	225 &self.working_directory
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
46524 d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	228 pub fn requirements(&self) -> &HashSet<String> {
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	229 &self.requirements
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	230 }
d03b0601e0eb rhg: initial support for shared repositories Simon Sapin <simon.sapin@octobus.net> parents: 46514 diff changeset	231
46545 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	232 pub fn config(&self) -> &Config {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	233 &self.config
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	234 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46544 diff changeset	235
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	236 /// 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	237 /// (`.hg/store`).
46638 1f55cd5b292f rust: Add a log file rotation utility Simon Sapin <simon.sapin@octobus.net> parents: 46632 diff changeset	238 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	239 Vfs { base: &self.dot_hg }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	240 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	241
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	242 /// For accessing repository store files (in `.hg/store`)
46638 1f55cd5b292f rust: Add a log file rotation utility Simon Sapin <simon.sapin@octobus.net> parents: 46632 diff changeset	243 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	244 Vfs { base: &self.store }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	245 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	246
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	247 /// For accessing the working copy
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: 46754 diff changeset	248 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	249 Vfs {
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	250 base: &self.working_directory,
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	251 }
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	252 }
46640 755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46638 diff changeset	253
48463 5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	254 pub fn try_with_wlock_no_wait<R>(
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	255 &self,
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	256 f: impl FnOnce() -> R,
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	257 ) -> Result<R, LockError> {
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	258 try_with_lock_no_wait(self.hg_vfs(), "wlock", f)
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	259 }
5734b03ecf3e rhg: Initial repository locking Simon Sapin <simon.sapin@octobus.net> parents: 48457 diff changeset	260
47380 bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	261 pub fn has_dirstate_v2(&self) -> bool {
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	262 self.requirements
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	263 .contains(requirements::DIRSTATE_V2_REQUIREMENT)
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	264 }
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	265
48457 005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	266 pub fn has_sparse(&self) -> bool {
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	267 self.requirements.contains(requirements::SPARSE_REQUIREMENT)
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	268 }
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	269
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	270 pub fn has_narrow(&self) -> bool {
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	271 self.requirements.contains(requirements::NARROW_REQUIREMENT)
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	272 }
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48084 diff changeset	273
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	274 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: 47980 diff changeset	275 Ok(self
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	276 .hg_vfs()
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	277 .read("dirstate")
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	278 .io_not_found_as_none()?
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	279 .unwrap_or(Vec::new()))
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	280 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	281
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	282 pub fn dirstate_parents(&self) -> Result<DirstateParents, HgError> {
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	283 Ok(*self.dirstate_parents.get_or_init(self)?)
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	284 }
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	285
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	286 fn read_dirstate_parents(&self) -> Result<DirstateParents, HgError> {
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	287 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: 47980 diff changeset	288 let parents = if dirstate.is_empty() {
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	289 if self.has_dirstate_v2() {
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	290 self.dirstate_data_file_uuid.set(None);
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	291 }
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	292 DirstateParents::NULL
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	293 } else if self.has_dirstate_v2() {
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	294 let docket =
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	295 crate::dirstate_tree::on_disk::read_docket(&dirstate)?;
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	296 self.dirstate_data_file_uuid
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	297 .set(Some(docket.uuid.to_owned()));
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	298 docket.parents()
47380 bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	299 } else {
bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	300 crate::dirstate::parsers::parse_dirstate_parents(&dirstate)?
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47413 diff changeset	301 .clone()
47380 bd88b6bfd8da rhg: Add support for dirstate-v2 Simon Sapin <simon.sapin@octobus.net> parents: 46822 diff changeset	302 };
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	303 self.dirstate_parents.set(parents);
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47413 diff changeset	304 Ok(parents)
46640 755c31a1caf9 rhg: Add support for the blackbox extension Simon Sapin <simon.sapin@octobus.net> parents: 46638 diff changeset	305 }
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	306
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	307 fn read_dirstate_data_file_uuid(
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	308 &self,
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	309 ) -> Result<Option<Vec<u8>>, HgError> {
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	310 assert!(
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	311 self.has_dirstate_v2(),
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	312 "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: 48465 diff changeset	313 );
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	314 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: 48465 diff changeset	315 if dirstate.is_empty() {
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	316 self.dirstate_parents.set(DirstateParents::NULL);
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	317 Ok(None)
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	318 } else {
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	319 let docket =
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	320 crate::dirstate_tree::on_disk::read_docket(&dirstate)?;
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	321 self.dirstate_parents.set(docket.parents());
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	322 Ok(Some(docket.uuid.to_owned()))
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	323 }
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	324 }
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	325
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	326 fn new_dirstate_map(&self) -> Result<OwningDirstateMap, DirstateError> {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	327 let dirstate_file_contents = self.dirstate_file_contents()?;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	328 if dirstate_file_contents.is_empty() {
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	329 self.dirstate_parents.set(DirstateParents::NULL);
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	330 if self.has_dirstate_v2() {
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	331 self.dirstate_data_file_uuid.set(None);
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	332 }
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	333 Ok(OwningDirstateMap::new_empty(Vec::new()))
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	334 } else if self.has_dirstate_v2() {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	335 let docket = crate::dirstate_tree::on_disk::read_docket(
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	336 &dirstate_file_contents,
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	337 )?;
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	338 self.dirstate_parents.set(docket.parents());
48466 c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	339 self.dirstate_data_file_uuid
c7c23bb036c9 rhg: Add lazy/cached dirstate data file ID parsing on Repo Simon Sapin <simon.sapin@octobus.net> parents: 48465 diff changeset	340 .set(Some(docket.uuid.to_owned()));
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	341 let data_size = docket.data_size();
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	342 let metadata = docket.tree_metadata();
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	343 let mut map = if let Some(data_mmap) = self
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	344 .hg_vfs()
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	345 .mmap_open(docket.data_filename())
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	346 .io_not_found_as_none()?
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	347 {
48005 d1d9510f73f0 rust: Update the memmap2 crate to version 0.4.0 Simon Sapin <simon.sapin@octobus.net> parents: 47997 diff changeset	348 OwningDirstateMap::new_empty(data_mmap)
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	349 } else {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	350 OwningDirstateMap::new_empty(Vec::new())
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	351 };
48084 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48005 diff changeset	352 let (on_disk, placeholder) = map.get_pair_mut();
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	353 *placeholder = DirstateMap::new_v2(on_disk, data_size, metadata)?;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	354 Ok(map)
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	355 } else {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	356 let mut map = OwningDirstateMap::new_empty(dirstate_file_contents);
48084 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48005 diff changeset	357 let (on_disk, placeholder) = map.get_pair_mut();
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	358 let (inner, parents) = DirstateMap::new_v1(on_disk)?;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	359 self.dirstate_parents
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	360 .set(parents.unwrap_or(DirstateParents::NULL));
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	361 *placeholder = inner;
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	362 Ok(map)
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	363 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	364 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	365
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	366 pub fn dirstate_map(
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	367 &self,
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	368 ) -> Result<Ref<OwningDirstateMap>, DirstateError> {
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	369 self.dirstate_map.get_or_init(self)
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	370 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	371
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	372 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: 47984 diff changeset	373 &self,
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	374 ) -> Result<RefMut<OwningDirstateMap>, DirstateError> {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	375 self.dirstate_map.get_mut_or_init(self)
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	376 }
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	377
47991 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	378 pub fn changelog(&self) -> Result<Ref<Changelog>, HgError> {
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	379 self.changelog.get_or_init(self)
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	380 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	381
47991 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	382 pub fn changelog_mut(&self) -> Result<RefMut<Changelog>, HgError> {
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	383 self.changelog.get_mut_or_init(self)
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	384 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	385
47991 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	386 pub fn manifestlog(&self) -> Result<Ref<Manifestlog>, HgError> {
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	387 self.manifestlog.get_or_init(self)
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	388 }
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	389
47991 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	390 pub fn manifestlog_mut(&self) -> Result<RefMut<Manifestlog>, HgError> {
47987 21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	391 self.manifestlog.get_mut_or_init(self)
21d25e9ee58e rust: Keep lazily-initialized Changelog and Manifest log on the Repo object Simon Sapin <simon.sapin@octobus.net> parents: 47986 diff changeset	392 }
47988 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	393
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47992 diff changeset	394 /// Returns the manifest of the changeset with the given node ID
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	395 pub fn manifest_for_node(
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	396 &self,
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	397 node: impl Into<NodePrefix>,
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	398 ) -> Result<Manifest, RevlogError> {
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47992 diff changeset	399 self.manifestlog()?.data_for_node(
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	400 self.changelog()?
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47992 diff changeset	401 .data_for_node(node.into())?
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	402 .manifest_node()?
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	403 .into(),
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	404 )
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	405 }
796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	406
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47992 diff changeset	407 /// Returns the manifest of the changeset with the given revision number
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	408 pub fn manifest_for_rev(
47988 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	409 &self,
cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	410 revision: Revision,
cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	411 ) -> Result<Manifest, RevlogError> {
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47992 diff changeset	412 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: 47992 diff changeset	413 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: 47992 diff changeset	414 .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: 47992 diff changeset	415 .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: 47992 diff changeset	416 .into(),
47992 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	417 )
47988 cfb6e6699b25 rust: Add Repo::manifest(revision) Simon Sapin <simon.sapin@octobus.net> parents: 47987 diff changeset	418 }
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47988 diff changeset	419
48547 7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	420 pub fn has_subrepos(&self) -> Result<bool, DirstateError> {
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	421 if let Some(entry) = self.dirstate_map()?.get(HgPath::new(".hgsub"))? {
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	422 Ok(entry.state().is_tracked())
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	423 } else {
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	424 Ok(false)
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	425 }
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	426 }
7f633432ca92 rhg: Sub-repositories are not supported Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	427
47991 001d747c2baf rust: Return HgError instead of RevlogError in revlog constructors Simon Sapin <simon.sapin@octobus.net> parents: 47989 diff changeset	428 pub fn filelog(&self, path: &HgPath) -> Result<Filelog, HgError> {
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47988 diff changeset	429 Filelog::open(self, path)
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 47988 diff changeset	430 }
48467 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	431
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	432 /// 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: 48466 diff changeset	433 ///
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	434 /// The "wlock" must be held while calling this.
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	435 /// See for example `try_with_wlock_no_wait`.
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	436 ///
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	437 /// TODO: have a `WritableRepo` type only accessible while holding the
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	438 /// lock?
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	439 pub fn write_dirstate(&self) -> Result<(), DirstateError> {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	440 let map = self.dirstate_map()?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	441 // TODO: Maintain a `DirstateMap::dirty` flag, and return early here if
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	442 // it’s unset
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	443 let parents = self.dirstate_parents()?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	444 let packed_dirstate = if self.has_dirstate_v2() {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	445 let uuid = self.dirstate_data_file_uuid.get_or_init(self)?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	446 let mut uuid = uuid.as_ref();
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	447 let can_append = uuid.is_some();
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	448 let (data, tree_metadata, append) = map.pack_v2(can_append)?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	449 if !append {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	450 uuid = None
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	451 }
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	452 let uuid = if let Some(uuid) = uuid {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	453 std::str::from_utf8(uuid)
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	454 .map_err(\|_\| {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	455 HgError::corrupted("non-UTF-8 dirstate data file ID")
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	456 })?
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	457 .to_owned()
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	458 } else {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	459 DirstateDocket::new_uid()
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	460 };
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	461 let data_filename = format!("dirstate.{}", uuid);
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	462 let data_filename = self.hg_vfs().join(data_filename);
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	463 let mut options = std::fs::OpenOptions::new();
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	464 if append {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	465 options.append(true);
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	466 } else {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	467 options.write(true).create_new(true);
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	468 }
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	469 let data_size = (\|\| {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	470 // TODO: loop and try another random ID if !append and this
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	471 // returns `ErrorKind::AlreadyExists`? Collision chance of two
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	472 // random IDs is one in 2**32
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	473 let mut file = options.open(&data_filename)?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	474 file.write_all(&data)?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	475 file.flush()?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	476 // TODO: use https://doc.rust-lang.org/std/io/trait.Seek.html#method.stream_position when we require Rust 1.51+
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	477 file.seek(SeekFrom::Current(0))
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	478 })()
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	479 .when_writing_file(&data_filename)?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	480 DirstateDocket::serialize(
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	481 parents,
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	482 tree_metadata,
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	483 data_size,
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	484 uuid.as_bytes(),
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	485 )
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	486 .map_err(\|_: std::num::TryFromIntError\| {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	487 HgError::corrupted("overflow in dirstate docket serialization")
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	488 })?
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	489 } else {
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	490 map.pack_v1(parents)?
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	491 };
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	492 self.hg_vfs().atomic_write("dirstate", &packed_dirstate)?;
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	493 Ok(())
2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48466 diff changeset	494 }
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	495 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	496
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	497 /// 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: 47984 diff changeset	498 ///
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	499 /// This differs from `OnceCell` in that the value can still be "deinitialized"
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	500 /// later by setting its inner `Option` to `None`.
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	501 struct LazyCell<T, E> {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	502 value: RefCell<Option<T>>,
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	503 // `Fn`s that don’t capture environment are zero-size, so this box does
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	504 // not allocate:
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	505 init: Box<dyn Fn(&Repo) -> Result<T, E>>,
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	506 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	507
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	508 impl<T, E> LazyCell<T, E> {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	509 fn new(init: impl Fn(&Repo) -> Result<T, E> + 'static) -> Self {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	510 Self {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	511 value: RefCell::new(None),
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	512 init: Box::new(init),
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	513 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	514 }
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	515
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	516 fn set(&self, value: T) {
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	517 *self.value.borrow_mut() = Some(value)
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	518 }
c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	519
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	520 fn get_or_init(&self, repo: &Repo) -> Result<Ref<T>, E> {
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	521 let mut borrowed = self.value.borrow();
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	522 if borrowed.is_none() {
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	523 drop(borrowed);
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	524 // 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: 47980 diff changeset	525 // 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: 47980 diff changeset	526 // needed.
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	527 *self.value.borrow_mut() = Some((self.init)(repo)?);
fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	528 borrowed = self.value.borrow()
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	529 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	530 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: 47980 diff changeset	531 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	532
48465 c8659e61073d rhg: Make Repo::dirstate_parents a LazyCell Simon Sapin <simon.sapin@octobus.net> parents: 48463 diff changeset	533 fn get_mut_or_init(&self, repo: &Repo) -> Result<RefMut<T>, E> {
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	534 let mut borrowed = self.value.borrow_mut();
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	535 if borrowed.is_none() {
47986 fc208d6faed3 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct Simon Sapin <simon.sapin@octobus.net> parents: 47984 diff changeset	536 *borrowed = Some((self.init)(repo)?);
47984 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	537 }
81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47980 diff changeset	538 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: 47980 diff changeset	539 }
46167 8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	540 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/repo.rs @ 48807:59be65b7cdfd stable