comparison rust/rhg/src/commands/cat.rs @ 46436:252d1bdba33d

rhg: replace `map_*_error` functions with `From` impls

Differential Revision: https://phab.mercurial-scm.org/D9876

46435:2e2033081274

use crate::commands::Command;
use crate::error::CommandError;
use crate::ui::utf8_to_local;
use crate::ui::Ui;
use hg::operations::{cat, CatRevError};
use hg::repo::Repo;
use hg::utils::hg_path::HgPathBuf;
use micro_timer::timed;
use std::convert::TryFrom;

            files.push(hg_file);
        }

        match self.rev {
            Some(rev) => {
                let data = cat(&repo, rev, &files)
                    .map_err(|e| map_rev_error(rev, e))?;
                self.display(ui, &data)
            }
            None => Err(CommandError::Unimplemented.into()),
        }
    }
}

/// Convert `CatRevError` to `CommandError`
fn map_rev_error(rev: &str, err: CatRevError) -> CommandError {
    match err {
        CatRevError::IoError(err) => CommandError::Abort(Some(
            utf8_to_local(&format!("abort: {}\n", err)).into(),
        )),
        CatRevError::InvalidRevision => CommandError::Abort(Some(
            utf8_to_local(&format!(
                "abort: invalid revision identifier {}\n",
                rev
            ))
            .into(),
        )),
        CatRevError::AmbiguousPrefix => CommandError::Abort(Some(
            utf8_to_local(&format!(
                "abort: ambiguous revision identifier {}\n",
                rev
            ))
            .into(),
        )),
        CatRevError::UnsuportedRevlogVersion(version) => {
            CommandError::Abort(Some(
                utf8_to_local(&format!(
                    "abort: unsupported revlog version {}\n",
                    version
                ))
                .into(),
            ))
        }
        CatRevError::CorruptedRevlog => {
            CommandError::Abort(Some("abort: corrupted revlog\n".into()))
        }
        CatRevError::UnknowRevlogDataFormat(format) => {
            CommandError::Abort(Some(
                utf8_to_local(&format!(
                    "abort: unknow revlog dataformat {:?}\n",
                    format
                ))
                .into(),
            ))
        }
    }
}

46436:252d1bdba33d

use crate::commands::Command;
use crate::error::CommandError;
use crate::ui::Ui;
use hg::operations::cat;
use hg::repo::Repo;
use hg::utils::hg_path::HgPathBuf;
use micro_timer::timed;
use std::convert::TryFrom;

            files.push(hg_file);
        }

        match self.rev {
            Some(rev) => {
                let data = cat(&repo, rev, &files).map_err(|e| (e, rev))?;
                self.display(ui, &data)
            }
            None => Err(CommandError::Unimplemented.into()),
        }
    }
}