This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8956

rhg: print error message when argument parsing fails
ClosedPublic

Authored by acezar on Aug 26 2020, 9:23 AM.

Details

Reviewers
marmoute
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa6a000ab135b: rhg: print error message when argument parsing fails

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

acezar created this revision.Aug 26 2020, 9:23 AM
marmoute accepted this revision.Aug 26 2020, 3:24 PM
marmoute added a subscriber: marmoute.

Seems better.

Alphare added a subscriber: Alphare.Aug 28 2020, 4:23 AM
Alphare added inline comments.
rust/rhg/src/ui.rs
52

Why does this return a Result?

acezar marked an inline comment as done.Aug 31 2020, 11:04 AM
acezar updated this revision to Diff 22495.
Alphare accepted this revision.Sep 6 2020, 3:52 AM
pulkit accepted this revision.Sep 11 2020, 5:05 AM
This revision is now accepted and ready to land.Sep 11 2020, 5:05 AM
acezar added a commit: rHGa6a000ab135b: rhg: print error message when argument parsing fails.Sep 11 2020, 5:46 AM
Closed by commit rHGa6a000ab135b: rhg: print error message when argument parsing fails (authored by acezar). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (3 lines)
Mrust/rhg/src/ui.rs (6 lines)
Mtests/test-rhg.t (6 lines)

Diff 22456

rust/rhg/src/main.rs

.version("0.0.1") .version("0.0.1")
.subcommand( .subcommand(
SubCommand::with_name("root").about(commands::root::HELP_TEXT), SubCommand::with_name("root").about(commands::root::HELP_TEXT),
) )
.subcommand( .subcommand(
SubCommand::with_name("files").about(commands::files::HELP_TEXT), SubCommand::with_name("files").about(commands::files::HELP_TEXT),
); );
let matches = app.clone().get_matches_safe().unwrap_or_else(|_| { let matches = app.clone().get_matches_safe().unwrap_or_else(|err| {
let _ = ui::Ui::new().writeln_stderr_str(&err.message);
std::process::exit(exitcode::UNIMPLEMENTED_COMMAND) std::process::exit(exitcode::UNIMPLEMENTED_COMMAND)
}); });
let ui = ui::Ui::new(); let ui = ui::Ui::new();
let command_result = match matches.subcommand_name() { let command_result = match matches.subcommand_name() {
Some(name) => match name { Some(name) => match name {
"root" => commands::root::RootCommand::new().run(&ui), "root" => commands::root::RootCommand::new().run(&ui),

rust/rhg/src/ui.rs

/// Write bytes to stderr /// Write bytes to stderr
pub fn write_stderr(&self, bytes: &[u8]) -> Result<(), UiError> { pub fn write_stderr(&self, bytes: &[u8]) -> Result<(), UiError> {
let mut stderr = self.stderr.lock(); let mut stderr = self.stderr.lock();
stderr.write_all(bytes).or_else(handle_stderr_error)?; stderr.write_all(bytes).or_else(handle_stderr_error)?;
stderr.flush().or_else(handle_stderr_error) stderr.flush().or_else(handle_stderr_error)
} }
/// Write string line to stderr
pub fn writeln_stderr_str(&self, s: &str) -> Result<(), UiError> {
AlphareUnsubmitted
Done

Why does this return a Result?

Alphare: Why does this return a `Result`?
eprintln!("{}", s);
Ok(())
}
} }
/// A buffered stdout writer for faster batch printing operations. /// A buffered stdout writer for faster batch printing operations.
pub struct StdoutBuffer<W: Write> { pub struct StdoutBuffer<W: Write> {
buf: io::BufWriter<W>, buf: io::BufWriter<W>,
} }
impl<W: Write> StdoutBuffer<W> { impl<W: Write> StdoutBuffer<W> {

tests/test-rhg.t

#require rust #require rust
Define an rhg function that will only run if rhg exists Define an rhg function that will only run if rhg exists
$ rhg() { $ rhg() {
> if [ -f "$RUNTESTDIR/../rust/target/debug/rhg" ]; then > if [ -f "$RUNTESTDIR/../rust/target/debug/rhg" ]; then
> "$RUNTESTDIR/../rust/target/debug/rhg" "$@" > "$RUNTESTDIR/../rust/target/debug/rhg" "$@"
> else > else
> echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg." > echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg."
> exit 80 > exit 80
> fi > fi
> } > }
Unimplemented command Unimplemented command
$ rhg unimplemented-command $ rhg unimplemented-command
error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context
USAGE:
rhg <SUBCOMMAND>
For more information try --help
[252] [252]
Finding root Finding root
$ rhg root $ rhg root
abort: no repository found in '$TESTTMP' (.hg not found)! abort: no repository found in '$TESTTMP' (.hg not found)!
[255] [255]
$ hg init repository $ hg init repository