##// END OF EJS Templates
rhg: Replace subcommand boilerplate with a macro...
rhg: Replace subcommand boilerplate with a macro This removes some repetition, and will avoid additional repetition in the next commit. Differential Revision: https://phab.mercurial-scm.org/D9969

File last commit:

r47229:d5896fad default
r47230:2e272cd7 default
Show More
cat.rs
73 lines | 2.0 KiB | application/rls-services+xml | RustLexer
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 use crate::error::CommandError;
Antoine Cezar
rhg: add a limited `rhg cat -r` subcommand...
r46113 use crate::ui::Ui;
Simon Sapin
rhg: Move subcommand CLI arguments definitions to respective modules...
r47229 use clap::Arg;
Simon Sapin
rhg: replace command structs with functions...
r47228 use clap::ArgMatches;
Simon Sapin
rhg: Parse system and user configuration at program start...
r47213 use hg::config::Config;
Simon Sapin
rhg: replace `map_*_error` functions with `From` impls...
r47165 use hg::operations::cat;
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 use hg::repo::Repo;
Antoine Cezar
rhg: add a limited `rhg cat -r` subcommand...
r46113 use hg::utils::hg_path::HgPathBuf;
use micro_timer::timed;
use std::convert::TryFrom;
pub const HELP_TEXT: &str = "
Output the current or given revision of files
";
Simon Sapin
rhg: Move subcommand CLI arguments definitions to respective modules...
r47229 pub fn args() -> clap::App<'static, 'static> {
clap::SubCommand::with_name("cat")
.arg(
Arg::with_name("rev")
.help("search the repository as it is in REV")
.short("-r")
.long("--revision")
.value_name("REV")
.takes_value(true),
)
.arg(
clap::Arg::with_name("files")
.required(true)
.multiple(true)
.empty_values(false)
.value_name("FILE")
.help("Activity to start: activity@category"),
)
.about(HELP_TEXT)
}
Simon Sapin
rhg: replace command structs with functions...
r47228 #[timed]
pub fn run(
ui: &Ui,
config: &Config,
args: &ArgMatches,
) -> Result<(), CommandError> {
let rev = args.value_of("rev");
let file_args = match args.values_of("files") {
Some(files) => files.collect(),
None => vec![],
};
Antoine Cezar
rhg: add a limited `rhg cat -r` subcommand...
r46113
Simon Sapin
rhg: replace command structs with functions...
r47228 let repo = Repo::find(config)?;
let cwd = hg::utils::current_dir()?;
let mut files = vec![];
for file in file_args.iter() {
// TODO: actually normalize `..` path segments etc?
let normalized = cwd.join(&file);
let stripped = normalized
.strip_prefix(&repo.working_directory_path())
// TODO: error message for path arguments outside of the repo
.map_err(|_| CommandError::abort(""))?;
let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
.map_err(|e| CommandError::abort(e.to_string()))?;
files.push(hg_file);
Antoine Cezar
rhg: add a limited `rhg cat -r` subcommand...
r46113 }
Simon Sapin
rhg: replace command structs with functions...
r47228 match rev {
Some(rev) => {
let data = cat(&repo, rev, &files).map_err(|e| (e, rev))?;
ui.write_stdout(&data)?;
Ok(())
}
None => Err(CommandError::Unimplemented.into()),
Antoine Cezar
rhg: add a limited `rhg cat -r` subcommand...
r46113 }
}