This is an archive of the discontinued Mercurial Phabricator instance.

rust/rhg/src/main.rs
29	This should be a fallback to Python (if the "no fallback" config option is not set, when we're at that point) instead of a panic. Maybe this handling can be done in the same follow-up patch as the `catch_unwind` one from the previous patch? Note that the previous behavior of exiting is not valid either, hence why I propose a follow-up.

SimonSapin added inline comments.Feb 9 2021, 4:14 AM

rust/rhg/src/main.rs
29	My understanding of `SubcommandRequired` is that it makes `get_matches_safe` return an error (so this code is not even reached) in all cases that would otherwise return `None` here. Is that not how it works?

Alphare added inline comments.Feb 9 2021, 4:18 AM

rust/rhg/src/main.rs
29	Ha, it does, but we also print an error to stderr at line 24 which confused me, when it should go to `log::debug` to grep for the fallback reason and not print anything to the user.

SimonSapin added a commit: rHG2e272cd70e90: rhg: Replace subcommand boilerplate with a macro.Feb 11 2021, 11:36 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG2e272cd70e90: rhg: Replace subcommand boilerplate with a macro (authored by SimonSapin). · Explain Why

This revision was automatically updated to reflect the committed changes.

SimonSapin added a commit: rHG95d37db31479: rhg: Replace subcommand boilerplate with a macro.Feb 12 2021, 12:04 AM

Revision Contents
Changeset List

			Path	Packages
D	M		rust/rhg/src/commands.rs (5 lines)
M			rust/rhg/src/main.rs (81 lines)

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 25560

rust/rhg/src/commands.rs

This file was deleted.

	pub mod cat;
	pub mod debugdata;
	pub mod debugrequirements;
	pub mod files;
	pub mod root;

rust/rhg/src/main.rs

	extern crate log;			extern crate log;
	use clap::App;			use clap::App;
	use clap::AppSettings;			use clap::AppSettings;
	use clap::ArgMatches;			use clap::ArgMatches;
	use format_bytes::format_bytes;			use format_bytes::format_bytes;

	mod commands;
	mod error;			mod error;
	mod exitcode;			mod exitcode;
	mod ui;			mod ui;
	use error::CommandError;			use error::CommandError;

	fn main() {			fn main() {
	env_logger::init();			env_logger::init();
	let app = App::new("rhg")			let app = App::new("rhg")
	.setting(AppSettings::AllowInvalidUtf8)			.setting(AppSettings::AllowInvalidUtf8)
	.setting(AppSettings::SubcommandRequired)			.setting(AppSettings::SubcommandRequired)
	.setting(AppSettings::VersionlessSubcommands)			.setting(AppSettings::VersionlessSubcommands)
	.version("0.0.1")			.version("0.0.1");
	.subcommand(commands::root::args())			let app = add_subcommand_args(app);
	.subcommand(commands::files::args())
	.subcommand(commands::cat::args())			let ui = ui::Ui::new();
	.subcommand(commands::debugdata::args())
	.subcommand(commands::debugrequirements::args());

	let matches = app.clone().get_matches_safe().unwrap_or_else(\|err\| {			let matches = app.clone().get_matches_safe().unwrap_or_else(\|err\| {
	let _ = ui::Ui::new().writeln_stderr_str(&err.message);			let _ = ui.writeln_stderr_str(&err.message);
	std::process::exit(exitcode::UNIMPLEMENTED)			std::process::exit(exitcode::UNIMPLEMENTED)
	});			});
				let (subcommand_name, subcommand_matches) = matches.subcommand();
				let run = subcommand_run_fn(subcommand_name)
				.expect("unknown subcommand name from clap despite AppSettings::SubcommandRequired");
				AlphareUnsubmitted Not Done This should be a fallback to Python (if the "no fallback" config option is not set, when we're at that point) instead of a panic. Maybe this handling can be done in the same follow-up patch as the `catch_unwind` one from the previous patch? Note that the previous behavior of exiting is not valid either, hence why I propose a follow-up. Alphare: This should be a fallback to Python (if the "no fallback" config option is not set, when we're…
				SimonSapinAuthorUnsubmitted Done My understanding of `SubcommandRequired` is that it makes `get_matches_safe` return an error (so this code is not even reached) in all cases that would otherwise return `None` here. Is that not how it works? SimonSapin: My understanding of `SubcommandRequired` is that it makes `get_matches_safe` return an error…
				AlphareUnsubmitted Not Done Ha, it does, but we also print an error to stderr at line 24 which confused me, when it should go to `log::debug` to grep for the fallback reason and not print anything to the user. Alphare: Ha, it does, but we also print an error to stderr at line 24 which confused me, when it should…
				let args = subcommand_matches
				.expect("no subcommand arguments from clap despite AppSettings::SubcommandRequired");

	let ui = ui::Ui::new();			let result = (\|\| -> Result<(), CommandError> {
				let config = hg::config::Config::load()?;
	let command_result = match_subcommand(matches, &ui);			run(&ui, &config, args)
				})();

	let exit_code = match command_result {			let exit_code = match result {
	Ok(_) => exitcode::OK,			Ok(_) => exitcode::OK,

	// Exit with a specific code and no error message to let a potential			// Exit with a specific code and no error message to let a potential
	// wrapper script fallback to Python-based Mercurial.			// wrapper script fallback to Python-based Mercurial.
	Err(CommandError::Unimplemented) => exitcode::UNIMPLEMENTED,			Err(CommandError::Unimplemented) => exitcode::UNIMPLEMENTED,

	Err(CommandError::Abort { message }) => {			Err(CommandError::Abort { message }) => {
	if !message.is_empty() {			if !message.is_empty() {
	// Ignore errors when writing to stderr, we’re already exiting			// Ignore errors when writing to stderr, we’re already exiting
	// with failure code so there’s not much more we can do.			// with failure code so there’s not much more we can do.
	let _ =			let _ =
	ui.write_stderr(&format_bytes!(b"abort: {}\n", message));			ui.write_stderr(&format_bytes!(b"abort: {}\n", message));
	}			}
	exitcode::ABORT			exitcode::ABORT
	}			}
	};			};
	std::process::exit(exit_code)			std::process::exit(exit_code)
	}			}

	fn match_subcommand(			macro_rules! subcommands {
	matches: ArgMatches,			($( $command: ident )+) => {
	ui: &ui::Ui,			mod commands {
	) -> Result<(), CommandError> {			$(
	let config = hg::config::Config::load()?;			pub mod $command;
				)+
	match matches.subcommand() {			}
	("root", Some(matches)) => commands::root::run(ui, &config, matches),
	("files", Some(matches)) => commands::files::run(ui, &config, matches),			fn add_subcommand_args<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> {
	("cat", Some(matches)) => commands::cat::run(ui, &config, matches),			app
	("debugdata", Some(matches)) => {			$(
	commands::debugdata::run(ui, &config, matches)			.subcommand(commands::$command::args())
				)+
				}

				fn subcommand_run_fn(name: &str) -> Option<fn(
				&ui::Ui,
				&hg::config::Config,
				&ArgMatches,
				) -> Result<(), CommandError>> {
				match name {
				$(
				stringify!($command) => Some(commands::$command::run),
				)+
				_ => None,
	}			}
	("debugrequirements", Some(matches)) => {
	commands::debugrequirements::run(ui, &config, matches)
	}			}
	_ => unreachable!(), // Because of AppSettings::SubcommandRequired,			};
	}			}

				subcommands! {
				cat
				debugdata
				debugrequirements
				files
				root
	}			}

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25503		Feb 8 2021, 5:43 PM	★	★
Diff 2	25560	rHG2e272cd70e905a7f30fbb5ae1331e8e931393f14	Feb 8 2021, 3:28 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

rhg: Replace subcommand boilerplate with a macroClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25560

rust/rhg/src/commands.rs

rust/rhg/src/main.rs

rhg: Replace subcommand boilerplate with a macro
ClosedPublic

Revision Contents
Changeset List