rust/rhg/src/commands/root.rs
24	If stdout is closed, this will fails. We probably want a better error than that eventually.
34	Maybe we use a bit more explicit error, like: "Error is RootNotFound, but no path provided" or soemthing in that flavor.
50	Same feedback, there wil be legit cas were we cannot write to stdout and we should improve the errors here (and test theses case)
60	What kind of error does Mercurial issue in this case ? Could we keep the same behavior ?

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21556		Jun 5 2020, 10:31 AM	★	★
Diff 2	21647		Jun 16 2020, 12:20 PM	★	★
Diff 3	21657		Jun 17 2020, 4:25 AM	★	★
Diff 4	21697		Jun 24 2020, 9:04 AM	★	★
Diff 5	21748	rHGafecc7f76f2dd718a7422fdf18a2c46bad6d70fe	Jun 5 2020, 3:01 AM	★	★

Commit	Parents	Author	Summary	Date
ae1a382b4861	6f1ca5cc4221	Antoine Cezar		Jun 5 2020, 3:01 AM

Status	Author	Revision
Closed	marmoute	D8630 tests: adjust to the new format in pyflakes output
Closed	marmoute	D8629 tests: consistently use pyflakes as a Python module
Closed	marmoute	D8628 tests: skip pyflakes for mercurial/thirdparty/
Closed	marmoute	D8627 rhg: add rhg tests to the Rust tests
Abandoned	acezar	D8614 rhg: add rhg tests to the Rust tests
Closed	acezar	D8613 rhg: add a limited `rhg root` subcommand
Closed	acezar	D8612 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`
Closed	acezar	D8611 rhg: add Command trait for subcommands implemented by rhg
Closed	acezar	D8610 rhg: add rhg crate
Closed	acezar	D8609 hg-core: add FindRoot operation to find repository root path
Closed	acezar	D8608 hg-core: add Operation interface for high-level hg operations

Diff 21556

rust/Cargo.lock

	source = "registry+https://github.com/rust-lang/crates.io-index"			source = "registry+https://github.com/rust-lang/crates.io-index"
	dependencies = [			dependencies = [
	"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",			"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
	]			]

	[[package]]			[[package]]
	name = "rhg"			name = "rhg"
	version = "0.1.0"			version = "0.1.0"
				dependencies = [
				"hg-core 0.1.0",
				]

	[[package]]			[[package]]
	name = "rustc_version"			name = "rustc_version"
	version = "0.2.3"			version = "0.2.3"
	source = "registry+https://github.com/rust-lang/crates.io-index"			source = "registry+https://github.com/rust-lang/crates.io-index"
	dependencies = [			dependencies = [
	"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",			"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
	]			]

rust/rhg/Cargo.toml

	[package]			[package]
	name = "rhg"			name = "rhg"
	version = "0.1.0"			version = "0.1.0"
	authors = ["Antoine Cezar <antoine.cezar@octobus.net>"]			authors = ["Antoine Cezar <antoine.cezar@octobus.net>"]
	edition = "2018"			edition = "2018"

	[dependencies]			[dependencies]
				hg-core = { path = "../hg-core"}

rust/rhg/src/commands/mod.rs

				pub mod root;
	use crate::error::CommandError;			use crate::error::CommandError;

	/// The common trait for rhg commands			/// The common trait for rhg commands
	///			///
	/// Normalize the interface of the commands provided by rhg			/// Normalize the interface of the commands provided by rhg
	pub trait Command {			pub trait Command {
	fn run() -> Result<(), CommandError>;			fn run() -> Result<(), CommandError>;
	}			}

rust/rhg/src/commands/root.rs

This file was added.

				use crate::commands::Command;
				use crate::error::{CommandError, CommandErrorKind};
				use hg::operations::{FindRoot, FindRootError, FindRootErrorKind, Operation};
				use hg::utils::files::get_bytes_from_path;
				use std::io::Write;
				use std::path::PathBuf;

				pub const HELP_TEXT: &str = "
				Print the root directory of the current repository.

				Returns 0 on success.
				";

				pub struct RootCommand;

				impl RootCommand {
				fn display_found_path(path_buf: PathBuf) -> Result<(), CommandError> {
				// TODO use formating macro
				let mut stdout = std::io::stdout();
				let bytes = get_bytes_from_path(path_buf);

				stdout
				.write_all(&[bytes.as_slice(), b"\n"].concat())
				.expect("Should be able to write to stdout");
				marmouteUnsubmitted Done If stdout is closed, this will fails. We probably want a better error than that eventually. marmoute: If stdout is closed, this will fails. We probably want a better error than that eventually.

				Err(CommandErrorKind::Ok.into())
				}

				fn display_error(error: FindRootError) -> Result<(), CommandError> {
				match error.kind {
				FindRootErrorKind::RootNotFound => {
				let current_dir = match error.current_dir {
				Some(path) => path,
				None => panic!("This should not happen"),
				marmouteUnsubmitted Done Maybe we use a bit more explicit error, like: "Error is RootNotFound, but no path provided" or soemthing in that flavor. marmoute: Maybe we use a bit more explicit error, like: "Error is RootNotFound, but no path provided" or…
				};

				// TODO use formating macro
				let mut stderr = std::io::stderr();
				let bytes = get_bytes_from_path(current_dir);

				stderr
				.write_all(
				&[
				b"abandon : no repository found in ",
				bytes.as_slice(),
				b" (.hg not found) !\n",
				]
				.concat(),
				)
				.expect("Should be able to write to stderr");
				marmouteUnsubmitted Done Same feedback, there wil be legit cas were we cannot write to stdout and we should improve the errors here (and test theses case) marmoute: Same feedback, there wil be legit cas were we cannot write to stdout and we should improve the…
				}
				FindRootErrorKind::GetCurrentDirError => {
				// TODO use formating macro
				let mut stderr = std::io::stderr();

				stderr
				.write_all(
				&concat!(
				"Current directory does not exists",
				"or permissions are insufficient to get access to it"
				marmouteUnsubmitted Done What kind of error does Mercurial issue in this case ? Could we keep the same behavior ? marmoute: What kind of error does Mercurial issue in this case ? Could we keep the same behavior ?
				)
				.as_bytes(),
				)
				.expect("Should be able to write to stderr");
				}
				}
				Err(CommandErrorKind::RootNotFound.into())
				}
				}

				impl Command for RootCommand {
				fn run() -> Result<(), CommandError> {
				let operation = FindRoot::new();
				match operation.run() {
				Ok(path_buf) => RootCommand::display_found_path(path_buf),
				Err(e) => RootCommand::display_error(e),
				}
				}
				}

rust/rhg/src/error.rs

				use crate::exitcode;
				use std::convert::From;

				/// The kind of command error
				#[derive(Debug, PartialEq)]
				pub enum CommandErrorKind {
				/// The command finished without error
				Ok,
				/// The root of the repository cannot be found
				RootNotFound,
				}

				impl CommandErrorKind {
				pub fn get_exit_code(&self) -> exitcode::ExitCode {
				match self {
				CommandErrorKind::Ok => exitcode::OK,
				CommandErrorKind::RootNotFound => exitcode::ABORT,
				}
				}
				}

	/// The error type for the Command trait			/// The error type for the Command trait
	#[derive(Debug, PartialEq)]			#[derive(Debug, PartialEq)]
	pub struct CommandError {}			pub struct CommandError {
				pub kind: CommandErrorKind,
				}

				impl From<CommandErrorKind> for CommandError {
				fn from(kind: CommandErrorKind) -> Self {
				CommandError { kind }
				}
				}

rust/rhg/src/exitcode.rs

	pub type ExitCode = i32;			pub type ExitCode = i32;

				/// Successful exit
				pub const OK: ExitCode = 0;

				/// Generic abort
				pub const ABORT: ExitCode = 255;

	/// Command not implemented by rhg			/// Command not implemented by rhg
	pub const UNIMPLEMENTED_COMMAND: ExitCode = 252;			pub const UNIMPLEMENTED_COMMAND: ExitCode = 252;

		Path
M		rust/Cargo.lock (3 lines)
M		rust/rhg/Cargo.toml (1 line)
M		rust/rhg/src/commands/mod.rs (1 line)
A	M	rust/rhg/src/commands/root.rs (79 lines)
M		rust/rhg/src/error.rs (30 lines)
M		rust/rhg/src/exitcode.rs (6 lines)

This is an archive of the discontinued Mercurial Phabricator instance.

rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 21556

rust/Cargo.lock

rust/rhg/Cargo.toml

rust/rhg/src/commands/mod.rs

rust/rhg/src/commands/root.rs

rust/rhg/src/error.rs

rust/rhg/src/exitcode.rs

This is an archive of the discontinued Mercurial Phabricator instance.

rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 21556

rust/Cargo.lock

rust/rhg/Cargo.toml

rust/rhg/src/commands/mod.rs

rust/rhg/src/commands/root.rs

rust/rhg/src/error.rs

rust/rhg/src/exitcode.rs

rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`
ClosedPublic

Revision Contents
Changeset List