Mercurial > hg
view rust/rhg/src/commands/cat.rs @ 51120:532e74ad3ff6
rust: run a clippy pass with the latest stable version
Our current version of clippy is older than the latest stable.
The newest version has new lints that are moslty good advice, so let's apply
them ahead of time. This has the added benefit of reducing the noise for
developpers like myself that use clippy as an IDE helper, as well as being
more prepared for a future clippy upgrade.
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Mon, 06 Nov 2023 11:06:08 +0100 |
parents | 067edf5083a1 |
children |
line wrap: on
line source
use crate::error::CommandError; use clap::Arg; use format_bytes::format_bytes; use hg::operations::cat; use hg::utils::hg_path::HgPathBuf; use std::ffi::OsString; use std::os::unix::prelude::OsStrExt; pub const HELP_TEXT: &str = " Output the current or given revision of files "; pub fn args() -> clap::Command { clap::command!("cat") .arg( Arg::new("rev") .help("search the repository as it is in REV") .short('r') .long("rev") .value_name("REV"), ) .arg( clap::Arg::new("files") .required(true) .num_args(1..) .value_name("FILE") .value_parser(clap::value_parser!(std::ffi::OsString)) .help("Files to output"), ) .about(HELP_TEXT) } #[logging_timer::time("trace")] pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { let cat_enabled = invocation.config.get_bool(b"rhg", b"cat")?; if !cat_enabled { return Err(CommandError::unsupported( "cat is disabled in rhg (enable it with 'rhg.cat = true' \ or enable fallback with 'rhg.on-unsupported = fallback')", )); } let rev = invocation.subcommand_args.get_one::<String>("rev"); let file_args = match invocation.subcommand_args.get_many::<OsString>("files") { Some(files) => files .filter(|s| !s.is_empty()) .map(|s| s.as_os_str()) .collect(), None => vec![], }; let repo = invocation.repo?; let cwd = hg::utils::current_dir()?; let working_directory = repo.working_directory_path(); let working_directory = cwd.join(working_directory); // Make it absolute let mut files = vec![]; for file in file_args { if file.as_bytes().starts_with(b"set:") { let message = "fileset"; return Err(CommandError::unsupported(message)); } let normalized = cwd.join(file); // TODO: actually normalize `..` path segments etc? let dotted = normalized.components().any(|c| c.as_os_str() == ".."); if file.as_bytes() == b"." || dotted { let message = "`..` or `.` path segment"; return Err(CommandError::unsupported(message)); } let relative_path = working_directory .strip_prefix(&cwd) .unwrap_or(&working_directory); let stripped = normalized .strip_prefix(&working_directory) .map_err(|_| { CommandError::abort(format!( "abort: {} not under root '{}'\n(consider using '--cwd {}')", String::from_utf8_lossy(file.as_bytes()), working_directory.display(), relative_path.display(), )) })?; let hg_file = HgPathBuf::try_from(stripped.to_path_buf()) .map_err(|e| CommandError::abort(e.to_string()))?; files.push(hg_file); } let files = files.iter().map(|file| file.as_ref()).collect(); // TODO probably move this to a util function like `repo.default_rev` or // something when it's used somewhere else let rev = match rev { Some(r) => r.to_string(), None => format!("{:x}", repo.dirstate_parents()?.p1), }; let output = cat(repo, &rev, files).map_err(|e| (e, rev.as_str()))?; for (_file, contents) in output.results { invocation.ui.write_stdout(&contents)?; } if !output.missing.is_empty() { let short = format!("{:x}", output.node.short()).into_bytes(); for path in &output.missing { invocation.ui.write_stderr(&format_bytes!( b"{}: no such file in rev {}\n", path.as_bytes(), short ))?; } } if output.found_any { Ok(()) } else { Err(CommandError::Unsuccessful) } }