This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	SimonSapin	D9938 rust: use HgError in ConfigError
Closed	SimonSapin	D9906 rust: Fold find_root and check_requirements into Repo::find
Closed	SimonSapin	D9905 rhg: Simplify CommandError based on its use
Closed	SimonSapin	D9904 rust: replace ToString impls with Display
Closed	SimonSapin	D9897 rust: use HgError in RevlogError and Vfs
Closed	SimonSapin	D9896 rust: replace RequirementsError with HgError
Closed	SimonSapin	D9895 rhg: Print an error message in more cases
Closed	SimonSapin	D9894 rust: Remove DirstateParseError and ListDirstateTrackedFilesError
Closed	SimonSapin	D9893 rust: Replace DirstatePackError with HgError
Closed	SimonSapin	D9892 rust: Introduce an `HgError` enum for common error cases
Closed	SimonSapin	D9877 rust: remove three enums that were identical to `RevlogError`
Closed	SimonSapin	D9876 rhg: replace `map_*_error` functions with `From` impls
Closed	SimonSapin	D9875 rust: replace trivial `impl From …` with `#[derive(derive_more::From)]`
Closed	SimonSapin	D9874 rust: remove `FooError` structs with only `kind: FooErrorKind` enum field
Closed	SimonSapin	D9873 rhg: centralize parsing of `--rev` CLI arguments
Closed	SimonSapin	D9864 rust: Remove hex parsing from the nodemap
Closed	SimonSapin	D9863 rust: Make NodePrefix allocation-free and Copy, remove NodePrefixRef
Closed	SimonSapin	D9862 rust: Exclude empty node prefixes
Closed	SimonSapin	D9861 rust: Simplify error type for reading hex node IDs
Closed	SimonSapin	D9860 rust: replace Node::encode_hex with std::fmt::LowerHex

Diff 25436

rust/hg-core/src/repo.rs

				use crate::errors::HgError;
	use crate::operations::{find_root, FindRootError};			use crate::operations::{find_root, FindRootError};
	use crate::requirements;			use crate::requirements;
	use memmap::{Mmap, MmapOptions};			use memmap::{Mmap, MmapOptions};
	use std::path::{Path, PathBuf};			use std::path::{Path, PathBuf};

	/// A repository on disk			/// A repository on disk
	pub struct Repo {			pub struct Repo {
	working_directory: PathBuf,			working_directory: PathBuf,
	working_directory,			working_directory,
	}			}
	}			}

	pub fn find() -> Result<Self, FindRootError> {			pub fn find() -> Result<Self, FindRootError> {
	find_root().map(Self::for_path)			find_root().map(Self::for_path)
	}			}

	pub fn check_requirements(			pub fn check_requirements(&self) -> Result<(), HgError> {
	&self,
	) -> Result<(), requirements::RequirementsError> {
	requirements::check(self)			requirements::check(self)
	}			}

	pub fn working_directory_path(&self) -> &Path {			pub fn working_directory_path(&self) -> &Path {
	&self.working_directory			&self.working_directory
	}			}

	/// For accessing repository files (in `.hg`), except for the store			/// For accessing repository files (in `.hg`), except for the store

rust/hg-core/src/requirements.rs

				use crate::errors::{HgError, HgResultExt, IoResultExt};
	use crate::repo::Repo;			use crate::repo::Repo;
	use std::io;

	#[derive(Debug)]			fn parse(bytes: &[u8]) -> Result<Vec<String>, HgError> {
	pub enum RequirementsError {
	// TODO: include a path?
	Io(io::Error),
	/// The `requires` file is corrupted
	Corrupted,
	/// The repository requires a feature that we don't support
	Unsupported {
	feature: String,
	},
	}

	fn parse(bytes: &[u8]) -> Result<Vec<String>, ()> {
	// The Python code reading this file uses `str.splitlines`			// The Python code reading this file uses `str.splitlines`
	// which looks for a number of line separators (even including a couple of			// which looks for a number of line separators (even including a couple of
	// non-ASCII ones), but Python code writing it always uses `\n`.			// non-ASCII ones), but Python code writing it always uses `\n`.
	let lines = bytes.split(\|&byte\| byte == b'\n');			let lines = bytes.split(\|&byte\| byte == b'\n');

	lines			lines
	.filter(\|line\| !line.is_empty())			.filter(\|line\| !line.is_empty())
	.map(\|line\| {			.map(\|line\| {
	// Python uses Unicode `str.isalnum` but feature names are all			// Python uses Unicode `str.isalnum` but feature names are all
	// ASCII			// ASCII
	if line[0].is_ascii_alphanumeric() && line.is_ascii() {			if line[0].is_ascii_alphanumeric() && line.is_ascii() {
	Ok(String::from_utf8(line.into()).unwrap())			Ok(String::from_utf8(line.into()).unwrap())
	} else {			} else {
	Err(())			Err(HgError::corrupted("parse error in 'requires' file"))
	}			}
	})			})
	.collect()			.collect()
	}			}

	pub fn load(repo: &Repo) -> Result<Vec<String>, RequirementsError> {			pub fn load(repo: &Repo) -> Result<Vec<String>, HgError> {
	match repo.hg_vfs().read("requires") {			if let Some(bytes) = repo
	Ok(bytes) => parse(&bytes).map_err(\|()\| RequirementsError::Corrupted),			.hg_vfs()
				.read("requires")
				.for_file("requires".as_ref())
				.io_not_found_as_none()?
				{
				parse(&bytes)
				} else {
	// Treat a missing file the same as an empty file.			// Treat a missing file the same as an empty file.
	// From `mercurial/localrepo.py`:			// From `mercurial/localrepo.py`:
	// > requires file contains a newline-delimited list of			// > requires file contains a newline-delimited list of
	// > features/capabilities the opener (us) must have in order to use			// > features/capabilities the opener (us) must have in order to use
	// > the repository. This file was introduced in Mercurial 0.9.2,			// > the repository. This file was introduced in Mercurial 0.9.2,
	// > which means very old repositories may not have one. We assume			// > which means very old repositories may not have one. We assume
	// > a missing file translates to no requirements.			// > a missing file translates to no requirements.
	Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
	Ok(Vec::new())			Ok(Vec::new())
	}			}

	Err(error) => Err(RequirementsError::Io(error))?,
	}
	}			}

	pub fn check(repo: &Repo) -> Result<(), RequirementsError> {			pub fn check(repo: &Repo) -> Result<(), HgError> {
	for feature in load(repo)? {			for feature in load(repo)? {
	if !SUPPORTED.contains(&&*feature) {			if !SUPPORTED.contains(&&*feature) {
	return Err(RequirementsError::Unsupported { feature });			// TODO: collect and all unknown features and include them in the
				// error message?
				return Err(HgError::UnsupportedFeature(format!(
				"repository requires feature unknown to this Mercurial: {}",
				feature
				)));
				AlphareUnsubmitted Not Done The Python implementation actually lists all of the missing features, your comment is correct. Alphare: The Python implementation actually lists all of the missing features, your comment is correct.
	}			}
	}			}
	Ok(())			Ok(())
	}			}

	// TODO: set this to actually-supported features			// TODO: set this to actually-supported features
	const SUPPORTED: &[&str] = &[			const SUPPORTED: &[&str] = &[
	"dotencode",			"dotencode",

rust/rhg/src/error.rs

	use crate::exitcode;			use crate::exitcode;
	use crate::ui::utf8_to_local;			use crate::ui::utf8_to_local;
	use crate::ui::UiError;			use crate::ui::UiError;
	use format_bytes::format_bytes;			use format_bytes::format_bytes;
	use hg::errors::HgError;			use hg::errors::HgError;
	use hg::operations::FindRootError;			use hg::operations::FindRootError;
	use hg::requirements::RequirementsError;
	use hg::revlog::revlog::RevlogError;			use hg::revlog::revlog::RevlogError;
	use hg::utils::files::get_bytes_from_path;			use hg::utils::files::get_bytes_from_path;
	use std::convert::From;			use std::convert::From;
	use std::path::PathBuf;			use std::path::PathBuf;

	/// The kind of command error			/// The kind of command error
	#[derive(Debug, derive_more::From)]			#[derive(Debug, derive_more::From)]
	pub enum CommandError {			pub enum CommandError {
	/// The root of the repository cannot be found			/// The root of the repository cannot be found
	RootNotFound(PathBuf),			RootNotFound(PathBuf),
	/// The current directory cannot be found			/// The current directory cannot be found
	CurrentDirNotFound(std::io::Error),			CurrentDirNotFound(std::io::Error),
	/// `.hg/requires`
	#[from]
	RequirementsError(RequirementsError),
	/// The standard output stream cannot be written to			/// The standard output stream cannot be written to
	StdoutError,			StdoutError,
	/// The standard error stream cannot be written to			/// The standard error stream cannot be written to
	StderrError,			StderrError,
	/// The command aborted			/// The command aborted
	Abort(Option<Vec<u8>>),			Abort(Option<Vec<u8>>),
	/// A mercurial capability as not been implemented.			/// A mercurial capability as not been implemented.
	Unimplemented,			Unimplemented,
	/// Common cases			/// Common cases
	#[from]			#[from]
	Other(HgError),			Other(HgError),
	}			}

	impl CommandError {			impl CommandError {
	pub fn get_exit_code(&self) -> exitcode::ExitCode {			pub fn get_exit_code(&self) -> exitcode::ExitCode {
	match self {			match self {
	CommandError::RootNotFound(_) => exitcode::ABORT,			CommandError::RootNotFound(_) => exitcode::ABORT,
	CommandError::CurrentDirNotFound(_) => exitcode::ABORT,			CommandError::CurrentDirNotFound(_) => exitcode::ABORT,
	CommandError::RequirementsError(
	RequirementsError::Unsupported { .. },
	) => exitcode::UNIMPLEMENTED_COMMAND,
	CommandError::RequirementsError(_) => exitcode::ABORT,
	CommandError::StdoutError => exitcode::ABORT,			CommandError::StdoutError => exitcode::ABORT,
	CommandError::StderrError => exitcode::ABORT,			CommandError::StderrError => exitcode::ABORT,
	CommandError::Abort(_) => exitcode::ABORT,			CommandError::Abort(_) => exitcode::ABORT,
	CommandError::Unimplemented => exitcode::UNIMPLEMENTED_COMMAND,			CommandError::Unimplemented => exitcode::UNIMPLEMENTED_COMMAND,
	CommandError::Other(HgError::UnsupportedFeature(_)) => {			CommandError::Other(HgError::UnsupportedFeature(_)) => {
	exitcode::UNIMPLEMENTED_COMMAND			exitcode::UNIMPLEMENTED_COMMAND
	}			}
	CommandError::Other(_) => exitcode::ABORT,			CommandError::Other(_) => exitcode::ABORT,
	b"abort: no repository found in '{}' (.hg not found)!\n",			b"abort: no repository found in '{}' (.hg not found)!\n",
	bytes.as_slice()			bytes.as_slice()
	))			))
	}			}
	CommandError::CurrentDirNotFound(e) => Some(format_bytes!(			CommandError::CurrentDirNotFound(e) => Some(format_bytes!(
	b"abort: error getting current working directory: {}\n",			b"abort: error getting current working directory: {}\n",
	e.to_string().as_bytes(),			e.to_string().as_bytes(),
	)),			)),
	CommandError::RequirementsError(RequirementsError::Corrupted) => {
	Some(
	"abort: .hg/requires is corrupted\n".as_bytes().to_owned(),
	)
	}
	CommandError::Abort(message) => message.to_owned(),			CommandError::Abort(message) => message.to_owned(),

	CommandError::RequirementsError(_)			CommandError::StdoutError
	\| CommandError::StdoutError
	\| CommandError::StderrError			\| CommandError::StderrError
	\| CommandError::Unimplemented			\| CommandError::Unimplemented
	\| CommandError::Other(HgError::UnsupportedFeature(_)) => None,			\| CommandError::Other(HgError::UnsupportedFeature(_)) => None,

	CommandError::Other(e) => {			CommandError::Other(e) => {
	Some(format_bytes!(b"{}\n", e.to_string().as_bytes()))			Some(format_bytes!(b"{}\n", e.to_string().as_bytes()))
	}			}
	}			}

tests/test-rhg.t

	generaldelta			generaldelta
	revlogv1			revlogv1
	sparserevlog			sparserevlog
	store			store
	indoor-pool			indoor-pool

	$ echo -e '\xFF' >> .hg/requires			$ echo -e '\xFF' >> .hg/requires
	$ rhg debugrequirements			$ rhg debugrequirements
	abort: .hg/requires is corrupted			corrupted repository: parse error in 'requires' file
	[255]			[255]

	Persistent nodemap			Persistent nodemap
	$ cd $TESTTMP			$ cd $TESTTMP
	$ rm -rf repository			$ rm -rf repository
	$ hg init repository			$ hg init repository
	$ cd repository			$ cd repository
	$ rhg debugrequirements \| grep nodemap			$ rhg debugrequirements \| grep nodemap

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25320		Jan 27 2021, 4:13 PM	★	★
Diff 2	25436	rHG02d3bb972121437c19b53a83cc9360bb3f2b725f	Jan 27 2021, 8:59 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

rust: replace RequirementsError with HgErrorClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25436

rust/hg-core/src/repo.rs

rust/hg-core/src/requirements.rs

rust/rhg/src/error.rs

tests/test-rhg.t

rust: replace RequirementsError with HgError
ClosedPublic

Revision Contents
Changeset List