Mercurial > public > mercurial-scm > hg-stable
view rust/rhg/src/commands/files.rs @ 46136:dca9cb99971c
rust: replace most "operation" structs with functions
The hg-core crate has a partially-formed concept of "operation",
represented as structs with constructors and a `run` method.
Each struct?s contructor takes different parameters,
and each `run` has a different return type.
Constructors typically don?t do much more than store parameters
for `run` to access them.
There was a comment about adding an `Operation` trait
when the language supports expressing something so general,
but it?s hard to imagine how operations with such different APIs
could be used in a generic context.
This commit starts removing the concept of "operation",
since those are pretty much just functions.
Differential Revision: https://phab.mercurial-scm.org/D9595
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Mon, 14 Dec 2020 14:59:23 +0100 |
parents | cc6faec62cb7 |
children | 8a4914397d02 |
line wrap: on
line source
use crate::commands::Command; use crate::error::{CommandError, CommandErrorKind}; use crate::ui::utf8_to_local; use crate::ui::Ui; use hg::operations::find_root; use hg::operations::{ list_rev_tracked_files, ListRevTrackedFilesError, ListRevTrackedFilesErrorKind, }; use hg::operations::{ Dirstate, ListDirstateTrackedFilesError, ListDirstateTrackedFilesErrorKind, }; use hg::requirements; use hg::utils::files::{get_bytes_from_path, relativize_path}; use hg::utils::hg_path::{HgPath, HgPathBuf}; use std::path::Path; pub const HELP_TEXT: &str = " List tracked files. Returns 0 on success. "; pub struct FilesCommand<'a> { rev: Option<&'a str>, } impl<'a> FilesCommand<'a> { pub fn new(rev: Option<&'a str>) -> Self { FilesCommand { rev } } fn display_files( &self, ui: &Ui, root: &Path, files: impl IntoIterator<Item = &'a HgPath>, ) -> Result<(), CommandError> { let cwd = std::env::current_dir() .or_else(|e| Err(CommandErrorKind::CurrentDirNotFound(e)))?; let rooted_cwd = cwd .strip_prefix(root) .expect("cwd was already checked within the repository"); let rooted_cwd = HgPathBuf::from(get_bytes_from_path(rooted_cwd)); let mut stdout = ui.stdout_buffer(); for file in files { stdout.write_all(relativize_path(file, &rooted_cwd).as_ref())?; stdout.write_all(b"\n")?; } stdout.flush()?; Ok(()) } } impl<'a> Command for FilesCommand<'a> { fn run(&self, ui: &Ui) -> Result<(), CommandError> { let root = find_root()?; requirements::check(&root)?; if let Some(rev) = self.rev { let files = list_rev_tracked_files(&root, rev) .map_err(|e| map_rev_error(rev, e))?; self.display_files(ui, &root, files.iter()) } else { let distate = Dirstate::new(&root).map_err(map_dirstate_error)?; let files = distate.tracked_files().map_err(map_dirstate_error)?; self.display_files(ui, &root, files) } } } /// Convert `ListRevTrackedFilesErrorKind` to `CommandError` fn map_rev_error(rev: &str, err: ListRevTrackedFilesError) -> CommandError { CommandError { kind: match err.kind { ListRevTrackedFilesErrorKind::IoError(err) => { CommandErrorKind::Abort(Some( utf8_to_local(&format!("abort: {}\n", err)).into(), )) } ListRevTrackedFilesErrorKind::InvalidRevision => { CommandErrorKind::Abort(Some( utf8_to_local(&format!( "abort: invalid revision identifier {}\n", rev )) .into(), )) } ListRevTrackedFilesErrorKind::AmbiguousPrefix => { CommandErrorKind::Abort(Some( utf8_to_local(&format!( "abort: ambiguous revision identifier {}\n", rev )) .into(), )) } ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) => { CommandErrorKind::Abort(Some( utf8_to_local(&format!( "abort: unsupported revlog version {}\n", version )) .into(), )) } ListRevTrackedFilesErrorKind::CorruptedRevlog => { CommandErrorKind::Abort(Some( "abort: corrupted revlog\n".into(), )) } ListRevTrackedFilesErrorKind::UnknowRevlogDataFormat(format) => { CommandErrorKind::Abort(Some( utf8_to_local(&format!( "abort: unknow revlog dataformat {:?}\n", format )) .into(), )) } }, } } /// Convert `ListDirstateTrackedFilesError` to `CommandError` fn map_dirstate_error(err: ListDirstateTrackedFilesError) -> CommandError { CommandError { kind: match err.kind { ListDirstateTrackedFilesErrorKind::IoError(err) => { CommandErrorKind::Abort(Some( utf8_to_local(&format!("abort: {}\n", err)).into(), )) } ListDirstateTrackedFilesErrorKind::ParseError(_) => { CommandErrorKind::Abort(Some( // TODO find a better error message b"abort: parse error\n".to_vec(), )) } }, } }