##// END OF EJS Templates
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field Use the enum directly as `FooError` instead. Differential Revision: https://phab.mercurial-scm.org/D9874

File last commit:

r47163:3e2d539d default
r47163:3e2d539d default
Show More
files.rs
127 lines | 4.1 KiB | application/rls-services+xml | RustLexer
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 use crate::commands::Command;
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 use crate::error::CommandError;
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 use crate::ui::utf8_to_local;
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 use crate::ui::Ui;
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 use hg::operations::{list_rev_tracked_files, ListRevTrackedFilesError};
use hg::operations::{Dirstate, ListDirstateTrackedFilesError};
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 use hg::repo::Repo;
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 use hg::utils::files::{get_bytes_from_path, relativize_path};
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 use hg::utils::hg_path::{HgPath, HgPathBuf};
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923
pub const HELP_TEXT: &str = "
List tracked files.
Returns 0 on success.
";
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 pub struct FilesCommand<'a> {
rev: Option<&'a str>,
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 }
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 impl<'a> FilesCommand<'a> {
pub fn new(rev: Option<&'a str>) -> Self {
FilesCommand { rev }
}
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 fn display_files(
&self,
ui: &Ui,
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 repo: &Repo,
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 files: impl IntoIterator<Item = &'a HgPath>,
) -> Result<(), CommandError> {
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 let cwd = std::env::current_dir()
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 .or_else(|e| Err(CommandError::CurrentDirNotFound(e)))?;
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 let rooted_cwd = cwd
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 .strip_prefix(repo.working_directory_path())
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 .expect("cwd was already checked within the repository");
let rooted_cwd = HgPathBuf::from(get_bytes_from_path(rooted_cwd));
Antoine Cezar
rhg: pass `ui` to `Command` `run`...
r46009 let mut stdout = ui.stdout_buffer();
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 for file in files {
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 stdout.write_all(relativize_path(file, &rooted_cwd).as_ref())?;
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 stdout.write_all(b"\n")?;
}
stdout.flush()?;
Ok(())
}
}
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 impl<'a> Command for FilesCommand<'a> {
fn run(&self, ui: &Ui) -> Result<(), CommandError> {
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 let repo = Repo::find()?;
repo.check_requirements()?;
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 if let Some(rev) = self.rev {
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 let files = list_rev_tracked_files(&repo, rev)
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 .map_err(|e| map_rev_error(rev, e))?;
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 self.display_files(ui, &repo, files.iter())
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 } else {
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 let distate = Dirstate::new(&repo).map_err(map_dirstate_error)?;
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 let files = distate.tracked_files().map_err(map_dirstate_error)?;
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 self.display_files(ui, &repo, files)
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 }
}
}
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 /// Convert `ListRevTrackedFilesError` to `CommandError`
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 fn map_rev_error(rev: &str, err: ListRevTrackedFilesError) -> CommandError {
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 match err {
ListRevTrackedFilesError::IoError(err) => CommandError::Abort(Some(
utf8_to_local(&format!("abort: {}\n", err)).into(),
)),
ListRevTrackedFilesError::InvalidRevision => {
CommandError::Abort(Some(
utf8_to_local(&format!(
"abort: invalid revision identifier {}\n",
rev
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 ))
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 .into(),
))
}
ListRevTrackedFilesError::AmbiguousPrefix => {
CommandError::Abort(Some(
utf8_to_local(&format!(
"abort: ambiguous revision identifier {}\n",
rev
Simon Sapin
rhg: allow specifying a changeset ID prefix...
r46646 ))
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 .into(),
))
}
ListRevTrackedFilesError::UnsuportedRevlogVersion(version) => {
CommandError::Abort(Some(
utf8_to_local(&format!(
"abort: unsupported revlog version {}\n",
version
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 ))
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 .into(),
))
}
ListRevTrackedFilesError::CorruptedRevlog => {
CommandError::Abort(Some("abort: corrupted revlog\n".into()))
}
ListRevTrackedFilesError::UnknowRevlogDataFormat(format) => {
CommandError::Abort(Some(
utf8_to_local(&format!(
"abort: unknow revlog dataformat {:?}\n",
format
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 ))
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 .into(),
))
}
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 }
}
/// Convert `ListDirstateTrackedFilesError` to `CommandError`
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 fn map_dirstate_error(err: ListDirstateTrackedFilesError) -> CommandError {
Simon Sapin
rust: remove `FooError` structs with only `kind: FooErrorKind` enum field...
r47163 match err {
ListDirstateTrackedFilesError::IoError(err) => CommandError::Abort(
Some(utf8_to_local(&format!("abort: {}\n", err)).into()),
),
ListDirstateTrackedFilesError::ParseError(_) => {
CommandError::Abort(Some(
// TODO find a better error message
b"abort: parse error\n".to_vec(),
))
}
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 }
}