rust/rhg/src/commands/cat.rs

--- a/rust/rhg/src/commands/cat.rs	Sat Dec 19 15:56:54 2020 +0100
+++ b/rust/rhg/src/commands/cat.rs	Mon Dec 14 16:33:15 2020 +0100
@@ -2,9 +2,8 @@
 use crate::error::{CommandError, CommandErrorKind};
 use crate::ui::utf8_to_local;
 use crate::ui::Ui;
-use hg::operations::find_root;
 use hg::operations::{cat, CatRevError, CatRevErrorKind};
-use hg::requirements;
+use hg::repo::Repo;
 use hg::utils::hg_path::HgPathBuf;
 use micro_timer::timed;
 use std::convert::TryFrom;
@@ -32,8 +31,8 @@
 impl<'a> Command for CatCommand<'a> {
     #[timed]
     fn run(&self, ui: &Ui) -> Result<(), CommandError> {
-        let root = find_root()?;
-        requirements::check(&root)?;
+        let repo = Repo::find()?;
+        repo.check_requirements()?;
         let cwd = std::env::current_dir()
             .or_else(|e| Err(CommandErrorKind::CurrentDirNotFound(e)))?;
 
@@ -41,7 +40,7 @@
         for file in self.files.iter() {
             let normalized = cwd.join(&file);
             let stripped = normalized
-                .strip_prefix(&root)
+                .strip_prefix(&repo.working_directory_path())
                 .or(Err(CommandErrorKind::Abort(None)))?;
             let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
                 .or(Err(CommandErrorKind::Abort(None)))?;
@@ -50,7 +49,7 @@
 
         match self.rev {
             Some(rev) => {
-                let data = cat(&root, rev, &files)
+                let data = cat(&repo, rev, &files)
                     .map_err(|e| map_rev_error(rev, e))?;
                 self.display(ui, &data)
             }