mercurial-scm/hg: rust/rhg/src/commands/files.rs annotate

annotate rust/rhg/src/commands/files.rs @ 46135: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

rev	line source
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	1 use crate::commands::Command;
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	2 use crate::error::{CommandError, CommandErrorKind};
45535 72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	3 use crate::ui::utf8_to_local;
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	4 use crate::ui::Ui;
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	5 use hg::operations::find_root;
45535 72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	6 use hg::operations::{
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	7 list_rev_tracked_files, ListRevTrackedFilesError,
dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	8 ListRevTrackedFilesErrorKind,
45535 72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	9 };
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	10 use hg::operations::{
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	11 Dirstate, ListDirstateTrackedFilesError, ListDirstateTrackedFilesErrorKind,
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	12 };
45937 2ad2745e0be9 rhg: exit with relevant code for unsupported requirements Simon Sapin <simon-commits@exyr.org> parents: 45537 diff changeset	13 use hg::requirements;
45436 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	14 use hg::utils::files::{get_bytes_from_path, relativize_path};
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	15 use hg::utils::hg_path::{HgPath, HgPathBuf};
46134 cc6faec62cb7 rust: change &PathBuf parameters to &Path Simon Sapin <simon.sapin@octobus.net> parents: 46032 diff changeset	16 use std::path::Path;
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	17
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	18 pub const HELP_TEXT: &str = "
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	19 List tracked files.
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	20
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	21 Returns 0 on success.
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	22 ";
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	23
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	24 pub struct FilesCommand<'a> {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	25 rev: Option<&'a str>,
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	26 }
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	27
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	28 impl<'a> FilesCommand<'a> {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	29 pub fn new(rev: Option<&'a str>) -> Self {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	30 FilesCommand { rev }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	31 }
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	32
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	33 fn display_files(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	34 &self,
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	35 ui: &Ui,
46134 cc6faec62cb7 rust: change &PathBuf parameters to &Path Simon Sapin <simon.sapin@octobus.net> parents: 46032 diff changeset	36 root: &Path,
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	37 files: impl IntoIterator<Item = &'a HgPath>,
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	38 ) -> Result<(), CommandError> {
45436 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	39 let cwd = std::env::current_dir()
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	40 .or_else(\|e\| Err(CommandErrorKind::CurrentDirNotFound(e)))?;
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	41 let rooted_cwd = cwd
46134 cc6faec62cb7 rust: change &PathBuf parameters to &Path Simon Sapin <simon.sapin@octobus.net> parents: 46032 diff changeset	42 .strip_prefix(root)
45436 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	43 .expect("cwd was already checked within the repository");
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	44 let rooted_cwd = HgPathBuf::from(get_bytes_from_path(rooted_cwd));
1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	45
45438 ed95ccc94333 rhg: pass `ui` to `Command` `run` Antoine Cezar <antoine.cezar@octobus.net> parents: 45436 diff changeset	46 let mut stdout = ui.stdout_buffer();
45436 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	47
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	48 for file in files {
45436 1b3197047f5c rhg: make output of `files` relative to the current directory and the root Rapha?l Gom?s <rgomes@octobus.net> parents: 45364 diff changeset	49 stdout.write_all(relativize_path(file, &rooted_cwd).as_ref())?;
45364 5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	50 stdout.write_all(b"\n")?;
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	51 }
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	52 stdout.flush()?;
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	53 Ok(())
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	54 }
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	55 }
45535 72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	56
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	57 impl<'a> Command for FilesCommand<'a> {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	58 fn run(&self, ui: &Ui) -> Result<(), CommandError> {
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	59 let root = find_root()?;
45937 2ad2745e0be9 rhg: exit with relevant code for unsupported requirements Simon Sapin <simon-commits@exyr.org> parents: 45537 diff changeset	60 requirements::check(&root)?;
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	61 if let Some(rev) = self.rev {
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	62 let files = list_rev_tracked_files(&root, rev)
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	63 .map_err(\|e\| map_rev_error(rev, e))?;
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	64 self.display_files(ui, &root, files.iter())
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	65 } else {
46135 dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	66 let distate = Dirstate::new(&root).map_err(map_dirstate_error)?;
dca9cb99971c rust: replace most "operation" structs with functions Simon Sapin <simon.sapin@octobus.net> parents: 46134 diff changeset	67 let files = distate.tracked_files().map_err(map_dirstate_error)?;
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	68 self.display_files(ui, &root, files)
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	69 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	70 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	71 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	72
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	73 /// Convert `ListRevTrackedFilesErrorKind` to `CommandError`
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	74 fn map_rev_error(rev: &str, err: ListRevTrackedFilesError) -> CommandError {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	75 CommandError {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	76 kind: match err.kind {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	77 ListRevTrackedFilesErrorKind::IoError(err) => {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	78 CommandErrorKind::Abort(Some(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	79 utf8_to_local(&format!("abort: {}\n", err)).into(),
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	80 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	81 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	82 ListRevTrackedFilesErrorKind::InvalidRevision => {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	83 CommandErrorKind::Abort(Some(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	84 utf8_to_local(&format!(
45996 904647f7d983 rhg: add a test for --rev with a hex changeset ID Simon Sapin <simon-commits@exyr.org> parents: 45937 diff changeset	85 "abort: invalid revision identifier {}\n",
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	86 rev
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	87 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	88 .into(),
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	89 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	90 }
46032 8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	91 ListRevTrackedFilesErrorKind::AmbiguousPrefix => {
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	92 CommandErrorKind::Abort(Some(
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	93 utf8_to_local(&format!(
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	94 "abort: ambiguous revision identifier {}\n",
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	95 rev
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	96 ))
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	97 .into(),
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	98 ))
8d6164098782 rhg: allow specifying a changeset ID prefix Simon Sapin <simon-commits@exyr.org> parents: 45996 diff changeset	99 }
45537 2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	100 ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) => {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	101 CommandErrorKind::Abort(Some(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	102 utf8_to_local(&format!(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	103 "abort: unsupported revlog version {}\n",
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	104 version
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	105 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	106 .into(),
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	107 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	108 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	109 ListRevTrackedFilesErrorKind::CorruptedRevlog => {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	110 CommandErrorKind::Abort(Some(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	111 "abort: corrupted revlog\n".into(),
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	112 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	113 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	114 ListRevTrackedFilesErrorKind::UnknowRevlogDataFormat(format) => {
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	115 CommandErrorKind::Abort(Some(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	116 utf8_to_local(&format!(
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	117 "abort: unknow revlog dataformat {:?}\n",
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	118 format
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	119 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	120 .into(),
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	121 ))
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	122 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	123 },
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	124 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	125 }
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	126
2f8227a12592 rhg: add `--revision` argument to `rhg files` Antoine Cezar <antoine.cezar@octobus.net> parents: 45535 diff changeset	127 /// Convert `ListDirstateTrackedFilesError` to `CommandError`
45535 72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	128 fn map_dirstate_error(err: ListDirstateTrackedFilesError) -> CommandError {
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	129 CommandError {
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	130 kind: match err.kind {
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	131 ListDirstateTrackedFilesErrorKind::IoError(err) => {
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	132 CommandErrorKind::Abort(Some(
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	133 utf8_to_local(&format!("abort: {}\n", err)).into(),
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	134 ))
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	135 }
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	136 ListDirstateTrackedFilesErrorKind::ParseError(_) => {
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	137 CommandErrorKind::Abort(Some(
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	138 // TODO find a better error message
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	139 b"abort: parse error\n".to_vec(),
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	140 ))
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	141 }
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	142 },
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	143 }
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation Antoine Cezar <antoine.cezar@octobus.net> parents: 45438 diff changeset	144 }

Mercurial > public > mercurial-scm > hg

annotate rust/rhg/src/commands/files.rs @ 46135:dca9cb99971c