This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8864

rhg: Do not return error when when we really mean ok in commands
ClosedPublic

Authored by acezar on Aug 3 2020, 10:25 AM.

Details

Reviewers
Alphare
indygreg
Group Reviewers
hg-reviewers
Commits
rHG227281e76c22: rhg: Do not return error when when we really mean ok in commands
Summary

Before when a command was successfull Err(CommandErrorKind::Ok.into()) was
returned which is an oxymoron. Using Ok(()) when everything is ok seems more
appropriate.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

acezar created this revision.Aug 3 2020, 10:25 AM
Alphare accepted this revision.Aug 3 2020, 11:02 AM
acezar updated this revision to Diff 22248.Aug 4 2020, 4:58 AM
indygreg accepted this revision.Aug 8 2020, 3:54 PM
This revision is now accepted and ready to land.Aug 8 2020, 3:54 PM

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/root.rs (2 lines)
Mrust/rhg/src/error.rs (3 lines)

Diff 22359

rust/rhg/src/commands/root.rs

&self, &self,
path_buf: PathBuf, path_buf: PathBuf,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let bytes = get_bytes_from_path(path_buf); let bytes = get_bytes_from_path(path_buf);
// TODO use formating macro // TODO use formating macro
self.ui.write_stdout(&[bytes.as_slice(), b"\n"].concat())?; self.ui.write_stdout(&[bytes.as_slice(), b"\n"].concat())?;
Err(CommandErrorKind::Ok.into()) Ok(())
} }
fn display_error(&self, error: FindRootError) -> Result<(), CommandError> { fn display_error(&self, error: FindRootError) -> Result<(), CommandError> {
match error.kind { match error.kind {
FindRootErrorKind::RootNotFound(path) => { FindRootErrorKind::RootNotFound(path) => {
let bytes = get_bytes_from_path(path); let bytes = get_bytes_from_path(path);
// TODO use formating macro // TODO use formating macro

rust/rhg/src/error.rs

use crate::exitcode; use crate::exitcode;
use crate::ui::UiError; use crate::ui::UiError;
use std::convert::From; use std::convert::From;
/// The kind of command error /// The kind of command error
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum CommandErrorKind { pub enum CommandErrorKind {
/// The command finished without error
Ok,
/// The root of the repository cannot be found /// The root of the repository cannot be found
RootNotFound, RootNotFound,
/// The current directory cannot be found /// The current directory cannot be found
CurrentDirNotFound, CurrentDirNotFound,
/// 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,
} }
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::Ok => exitcode::OK,
CommandErrorKind::RootNotFound => exitcode::ABORT, CommandErrorKind::RootNotFound => exitcode::ABORT,
CommandErrorKind::CurrentDirNotFound => exitcode::ABORT, CommandErrorKind::CurrentDirNotFound => exitcode::ABORT,
CommandErrorKind::StdoutError => exitcode::ABORT, CommandErrorKind::StdoutError => exitcode::ABORT,
CommandErrorKind::StderrError => exitcode::ABORT, CommandErrorKind::StderrError => exitcode::ABORT,
} }
} }
} }