This is an archive of the discontinued Mercurial Phabricator instance.

			Path	Packages
M			rust/hg-core/src/requirements.rs (19 lines)
M			rust/rhg/src/commands/cat.rs (2 lines)
M			rust/rhg/src/commands/files.rs (2 lines)
M			rust/rhg/src/error.rs (3 lines)
M			tests/test-rhg.t (16 lines)

Status	Author	Revision
Closed	SimonSapin	D9400 rhg: check that .hg/requires is ASCII
Closed	SimonSapin	D9399 rhg: exit with relevant code for unsupported requirements
Closed	SimonSapin	D9398 requirements: move loading to hg-core and add parsing
Closed	SimonSapin	D9397 rhg: add a `debugrequirements` subcommand

Diff 23712

rust/hg-core/src/requirements.rs

This file uses an unknown character encoding.

	// > a missing file translates to no requirements.			// > a missing file translates to no requirements.
	Err(error) if error.kind() == std::io::ErrorKind::NotFound => {			Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
	Ok(Vec::new())			Ok(Vec::new())
	}			}

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

				pub fn check(repo_root: &Path) -> Result<(), RequirementsError> {
				for feature in load(repo_root)? {
				if !SUPPORTED.contains(&&*feature) {
				return Err(RequirementsError::Unsupported { feature })
				}
				}
				Ok(())
				}

				// TODO: set this to actually-supported features
				const SUPPORTED: &[&str] = &[
				"dotencode",
				"fncache",
				"generaldelta",
				"revlogv1",
				"sparserevlog",
				"store",
				];

rust/rhg/src/commands/cat.rs

	use crate::commands::Command;			use crate::commands::Command;
	use crate::error::{CommandError, CommandErrorKind};			use crate::error::{CommandError, CommandErrorKind};
	use crate::ui::utf8_to_local;			use crate::ui::utf8_to_local;
	use crate::ui::Ui;			use crate::ui::Ui;
	use hg::operations::FindRoot;			use hg::operations::FindRoot;
	use hg::operations::{CatRev, CatRevError, CatRevErrorKind};			use hg::operations::{CatRev, CatRevError, CatRevErrorKind};
				use hg::requirements;
	use hg::utils::hg_path::HgPathBuf;			use hg::utils::hg_path::HgPathBuf;
	use micro_timer::timed;			use micro_timer::timed;
	use std::convert::TryFrom;			use std::convert::TryFrom;

	pub const HELP_TEXT: &str = "			pub const HELP_TEXT: &str = "
	Output the current or given revision of files			Output the current or given revision of files
	";			";

	Ok(())			Ok(())
	}			}
	}			}

	impl<'a> Command for CatCommand<'a> {			impl<'a> Command for CatCommand<'a> {
	#[timed]			#[timed]
	fn run(&self, ui: &Ui) -> Result<(), CommandError> {			fn run(&self, ui: &Ui) -> Result<(), CommandError> {
	let root = FindRoot::new().run()?;			let root = FindRoot::new().run()?;
				requirements::check(&root)?;
	let cwd = std::env::current_dir()			let cwd = std::env::current_dir()
	.or_else(\|e\| Err(CommandErrorKind::CurrentDirNotFound(e)))?;			.or_else(\|e\| Err(CommandErrorKind::CurrentDirNotFound(e)))?;

	let mut files = vec![];			let mut files = vec![];
	for file in self.files.iter() {			for file in self.files.iter() {
	let normalized = cwd.join(&file);			let normalized = cwd.join(&file);
	let stripped = normalized			let stripped = normalized
	.strip_prefix(&root)			.strip_prefix(&root)

rust/rhg/src/commands/files.rs

	use crate::commands::Command;			use crate::commands::Command;
	use crate::error::{CommandError, CommandErrorKind};			use crate::error::{CommandError, CommandErrorKind};
	use crate::ui::utf8_to_local;			use crate::ui::utf8_to_local;
	use crate::ui::Ui;			use crate::ui::Ui;
	use hg::operations::FindRoot;			use hg::operations::FindRoot;
	use hg::operations::{			use hg::operations::{
	ListDirstateTrackedFiles, ListDirstateTrackedFilesError,			ListDirstateTrackedFiles, ListDirstateTrackedFilesError,
	ListDirstateTrackedFilesErrorKind,			ListDirstateTrackedFilesErrorKind,
	};			};
	use hg::operations::{			use hg::operations::{
	ListRevTrackedFiles, ListRevTrackedFilesError,			ListRevTrackedFiles, ListRevTrackedFilesError,
	ListRevTrackedFilesErrorKind,			ListRevTrackedFilesErrorKind,
	};			};
				use hg::requirements;
	use hg::utils::files::{get_bytes_from_path, relativize_path};			use hg::utils::files::{get_bytes_from_path, relativize_path};
	use hg::utils::hg_path::{HgPath, HgPathBuf};			use hg::utils::hg_path::{HgPath, HgPathBuf};
	use std::path::PathBuf;			use std::path::PathBuf;

	pub const HELP_TEXT: &str = "			pub const HELP_TEXT: &str = "
	List tracked files.			List tracked files.

	Returns 0 on success.			Returns 0 on success.
	stdout.flush()?;			stdout.flush()?;
	Ok(())			Ok(())
	}			}
	}			}

	impl<'a> Command for FilesCommand<'a> {			impl<'a> Command for FilesCommand<'a> {
	fn run(&self, ui: &Ui) -> Result<(), CommandError> {			fn run(&self, ui: &Ui) -> Result<(), CommandError> {
	let root = FindRoot::new().run()?;			let root = FindRoot::new().run()?;
				requirements::check(&root)?;
	if let Some(rev) = self.rev {			if let Some(rev) = self.rev {
	let mut operation = ListRevTrackedFiles::new(&root, rev)			let mut operation = ListRevTrackedFiles::new(&root, rev)
	.map_err(\|e\| map_rev_error(rev, e))?;			.map_err(\|e\| map_rev_error(rev, e))?;
	let files = operation.run().map_err(\|e\| map_rev_error(rev, e))?;			let files = operation.run().map_err(\|e\| map_rev_error(rev, e))?;
	self.display_files(ui, &root, files)			self.display_files(ui, &root, files)
	} else {			} else {
	let mut operation = ListDirstateTrackedFiles::new(&root)			let mut operation = ListDirstateTrackedFiles::new(&root)
	.map_err(map_dirstate_error)?;			.map_err(map_dirstate_error)?;

rust/rhg/src/error.rs

	Unimplemented,			Unimplemented,
	}			}

	impl CommandErrorKind {			impl CommandErrorKind {
	pub fn get_exit_code(&self) -> exitcode::ExitCode {			pub fn get_exit_code(&self) -> exitcode::ExitCode {
	match self {			match self {
	CommandErrorKind::RootNotFound(_) => exitcode::ABORT,			CommandErrorKind::RootNotFound(_) => exitcode::ABORT,
	CommandErrorKind::CurrentDirNotFound(_) => exitcode::ABORT,			CommandErrorKind::CurrentDirNotFound(_) => exitcode::ABORT,
				CommandErrorKind::RequirementsError(
				RequirementsError::Unsupported { .. },
				) => exitcode::UNIMPLEMENTED_COMMAND,
	CommandErrorKind::RequirementsError(_) => exitcode::ABORT,			CommandErrorKind::RequirementsError(_) => exitcode::ABORT,
	CommandErrorKind::StdoutError => exitcode::ABORT,			CommandErrorKind::StdoutError => exitcode::ABORT,
	CommandErrorKind::StderrError => exitcode::ABORT,			CommandErrorKind::StderrError => exitcode::ABORT,
	CommandErrorKind::Abort(_) => exitcode::ABORT,			CommandErrorKind::Abort(_) => exitcode::ABORT,
	CommandErrorKind::Unimplemented => exitcode::UNIMPLEMENTED_COMMAND,			CommandErrorKind::Unimplemented => exitcode::UNIMPLEMENTED_COMMAND,
	}			}
	}			}

tests/test-rhg.t

	Requirements			Requirements
	$ rhg debugrequirements			$ rhg debugrequirements
	dotencode			dotencode
	fncache			fncache
	generaldelta			generaldelta
	revlogv1			revlogv1
	sparserevlog			sparserevlog
	store			store

				$ echo indoor-pool >> .hg/requires
				$ rhg files
				[252]

				$ rhg cat -r 1 copy_of_original
				[252]

				$ rhg debugrequirements
				dotencode
				fncache
				generaldelta
				revlogv1
				sparserevlog
				store
				indoor-pool

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23671		Nov 25 2020, 7:41 AM	★	★
Diff 2	23712	rHG2ad2745e0be9eae528cbd001c013f2282478e583	Nov 24 2020, 12:52 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

rhg: exit with relevant code for unsupported requirementsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23712

rust/hg-core/src/requirements.rs

rust/rhg/src/commands/cat.rs

rust/rhg/src/commands/files.rs

rust/rhg/src/error.rs

tests/test-rhg.t

rhg: exit with relevant code for unsupported requirements
ClosedPublic

Revision Contents
Changeset List