This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	SimonSapin	D9972 rhg: add limited support for the `config` sub-command
Closed	SimonSapin	D9971 rhg: Add support for --config CLI arguments
Closed	SimonSapin	D9970 rhg: Add support for -R and --repository command-line arguments
Closed	SimonSapin	D9969 rhg: Replace subcommand boilerplate with a macro
Closed	SimonSapin	D9968 rhg: Move subcommand CLI arguments definitions to respective modules
Closed	SimonSapin	D9967 rhg: replace command structs with functions
Closed	SimonSapin	D9966 rust: Use the DisplayBytes trait in config printing
Closed	SimonSapin	D9964 rhg: Parse per-repository configuration
Closed	SimonSapin	D9963 rhg: Abort based on config on share-safe mismatch
Closed	SimonSapin	D9962 rhg: Parse system and user configuration at program start
Closed	SimonSapin	D9961 rust: Parse system and user configuration
Closed	SimonSapin	D9960 rust: Remove unnecessary check for absolute path before joining
Closed	SimonSapin	D9959 rust: replace read_whole_file with std::fs::read

Diff 25530

rust/hg-core/src/errors.rs

	use std::fmt;			use std::fmt;

	/// Common error cases that can happen in many different APIs			/// Common error cases that can happen in many different APIs
	#[derive(Debug)]			#[derive(Debug)]
	pub enum HgError {			pub enum HgError {
	IoError {			IoError {
	error: std::io::Error,			error: std::io::Error,
	context: IoErrorContext,			context: IoErrorContext,
	},			},

	/// A file under `.hg/` normally only written by Mercurial			/// A file under `.hg/` normally only written by Mercurial is not in the
				/// expected format. This indicates a bug in Mercurial, filesystem
				/// corruption, or hardware failure.
	///			///
	/// The given string is a short explanation for users, not intended to be			/// The given string is a short explanation for users, not intended to be
	/// machine-readable.			/// machine-readable.
	CorruptedRepository(String),			CorruptedRepository(String),

	/// The respository or requested operation involves a feature not			/// The respository or requested operation involves a feature not
	/// supported by the Rust implementation. Falling back to the Python			/// supported by the Rust implementation. Falling back to the Python
	/// implementation may or may not work.			/// implementation may or may not work.
	///			///
	/// The given string is a short explanation for users, not intended to be			/// The given string is a short explanation for users, not intended to be
	/// machine-readable.			/// machine-readable.
	UnsupportedFeature(String),			UnsupportedFeature(String),

				/// Operation cannot proceed for some other reason.
				///
				/// The given string is a short explanation for users, not intended to be
				/// machine-readable.
				Abort(String),
	}			}

	/// Details about where an I/O error happened			/// Details about where an I/O error happened
	#[derive(Debug, derive_more::From)]			#[derive(Debug, derive_more::From)]
	pub enum IoErrorContext {			pub enum IoErrorContext {
	/// A filesystem operation for the given file			/// A filesystem operation for the given file
	#[from]			#[from]
	File(std::path::PathBuf),			File(std::path::PathBuf),
	// to aid debugging?			// to aid debugging?
	// https://doc.rust-lang.org/std/backtrace/struct.Backtrace.html			// https://doc.rust-lang.org/std/backtrace/struct.Backtrace.html
	HgError::CorruptedRepository(explanation.into())			HgError::CorruptedRepository(explanation.into())
	}			}

	pub fn unsupported(explanation: impl Into<String>) -> Self {			pub fn unsupported(explanation: impl Into<String>) -> Self {
	HgError::UnsupportedFeature(explanation.into())			HgError::UnsupportedFeature(explanation.into())
	}			}
				pub fn abort(explanation: impl Into<String>) -> Self {
				HgError::Abort(explanation.into())
				}
	}			}

	// TODO: use `DisplayBytes` instead to show non-Unicode filenames losslessly?			// TODO: use `DisplayBytes` instead to show non-Unicode filenames losslessly?
	impl fmt::Display for HgError {			impl fmt::Display for HgError {
	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {			fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
	match self {			match self {
	HgError::IoError { error, context } => {			HgError::IoError { error, context } => {
	write!(f, "{}: {}", error, context)			write!(f, "{}: {}", error, context)
	}			}
	HgError::CorruptedRepository(explanation) => {			HgError::CorruptedRepository(explanation) => {
	write!(f, "corrupted repository: {}", explanation)			write!(f, "corrupted repository: {}", explanation)
	}			}
	HgError::UnsupportedFeature(explanation) => {			HgError::UnsupportedFeature(explanation) => {
	write!(f, "unsupported feature: {}", explanation)			write!(f, "unsupported feature: {}", explanation)
	}			}
				HgError::Abort(explanation) => explanation.fmt(f),
	}			}
	}			}
	}			}

	// TODO: use `DisplayBytes` instead to show non-Unicode filenames losslessly?			// TODO: use `DisplayBytes` instead to show non-Unicode filenames losslessly?
	impl fmt::Display for IoErrorContext {			impl fmt::Display for IoErrorContext {
	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {			fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
	match self {			match self {

rust/hg-core/src/repo.rs

	#[derive(Clone, Copy)]			#[derive(Clone, Copy)]
	pub(crate) struct Vfs<'a> {			pub(crate) struct Vfs<'a> {
	base: &'a Path,			base: &'a Path,
	}			}

	impl Repo {			impl Repo {
	/// Search the current directory and its ancestores for a repository:			/// Search the current directory and its ancestores for a repository:
	/// a working directory that contains a `.hg` sub-directory.			/// a working directory that contains a `.hg` sub-directory.
	pub fn find(_config: &Config) -> Result<Self, RepoFindError> {			pub fn find(config: &Config) -> Result<Self, RepoFindError> {
	let current_directory = crate::utils::current_dir()?;			let current_directory = crate::utils::current_dir()?;
	// ancestors() is inclusive: it first yields `current_directory` as-is.			// ancestors() is inclusive: it first yields `current_directory` as-is.
	for ancestor in current_directory.ancestors() {			for ancestor in current_directory.ancestors() {
	if ancestor.join(".hg").is_dir() {			if ancestor.join(".hg").is_dir() {
	return Ok(Self::new_at_path(ancestor.to_owned())?);			return Ok(Self::new_at_path(ancestor.to_owned(), config)?);
	}			}
	}			}
	Err(RepoFindError::NotFoundInCurrentDirectoryOrAncestors {			Err(RepoFindError::NotFoundInCurrentDirectoryOrAncestors {
	current_directory,			current_directory,
	})			})
	}			}

	/// To be called after checking that `.hg` is a sub-directory			/// To be called after checking that `.hg` is a sub-directory
	fn new_at_path(working_directory: PathBuf) -> Result<Self, HgError> {			fn new_at_path(
				working_directory: PathBuf,
				config: &Config,
				) -> Result<Self, HgError> {
	let dot_hg = working_directory.join(".hg");			let dot_hg = working_directory.join(".hg");

	let hg_vfs = Vfs { base: &dot_hg };			let hg_vfs = Vfs { base: &dot_hg };
	let mut reqs = requirements::load_if_exists(hg_vfs)?;			let mut reqs = requirements::load_if_exists(hg_vfs)?;
	let relative =			let relative =
	reqs.contains(requirements::RELATIVE_SHARED_REQUIREMENT);			reqs.contains(requirements::RELATIVE_SHARED_REQUIREMENT);
	let shared =			let shared =
	reqs.contains(requirements::SHARED_REQUIREMENT) \|\| relative;			reqs.contains(requirements::SHARED_REQUIREMENT) \|\| relative;
	}			}

	store_path = shared_path.join("store");			store_path = shared_path.join("store");

	let source_is_share_safe =			let source_is_share_safe =
	requirements::load(Vfs { base: &shared_path })?			requirements::load(Vfs { base: &shared_path })?
	.contains(requirements::SHARESAFE_REQUIREMENT);			.contains(requirements::SHARESAFE_REQUIREMENT);

	// TODO: support for `share.safe-mismatch.*` config
	if share_safe && !source_is_share_safe {			if share_safe && !source_is_share_safe {
	return Err(HgError::unsupported("share-safe downgrade"));			return Err(match config.get(b"safe-mismatch", b"source-not-safe") {
				Some(b"abort") \| None => HgError::abort(
				"share source does not support share-safe requirement"
				),
				_ => HgError::unsupported("share-safe downgrade")
				});
	} else if source_is_share_safe && !share_safe {			} else if source_is_share_safe && !share_safe {
	return Err(HgError::unsupported("share-safe upgrade"));			return Err(
				match config.get(b"safe-mismatch", b"source-safe") {
				Some(b"abort") \| None => HgError::abort(
				"version mismatch: source uses share-safe \
				functionality while the current share does not",
				),
				_ => HgError::unsupported("share-safe upgrade"),
				},
				);
	}			}
	}			}

	let repo = Self {			let repo = Self {
	requirements: reqs,			requirements: reqs,
	working_directory,			working_directory,
	store: store_path,			store: store_path,
	dot_hg,			dot_hg,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25493		Feb 5 2021, 4:26 AM	★	★
Diff 2	25530	rHGf031fe1c6ededaee65a2823ea109daeae49fa4ad	Feb 4 2021, 8:29 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

rhg: Abort based on config on share-safe mismatchClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25530

rust/hg-core/src/errors.rs

rust/hg-core/src/repo.rs

rhg: Abort based on config on share-safe mismatch
ClosedPublic

Revision Contents
Changeset List