Mercurial > public > mercurial-scm > hg-stable
diff rust/rhg/src/commands/cat.rs @ 46753:97ac588b6d9e
rhg: Don?t make repository path absolute too early
Some error messages want to include a relative path,
which affects the output of some tests.
Differential Revision: https://phab.mercurial-scm.org/D10138
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Mon, 08 Mar 2021 08:35:43 +0100 |
| parents | 33f2d56acc73 |
| children | b1f2c2b336ec |
line wrap: on
line diff
--- a/rust/rhg/src/commands/cat.rs Fri Mar 05 13:28:49 2021 +0100 +++ b/rust/rhg/src/commands/cat.rs Mon Mar 08 08:35:43 2021 +0100 @@ -40,13 +40,15 @@ let repo = invocation.repo?; let cwd = hg::utils::current_dir()?; + let working_directory = repo.working_directory_path(); + let working_directory = cwd.join(working_directory); // Make it absolute let mut files = vec![]; for file in file_args.iter() { // TODO: actually normalize `..` path segments etc? let normalized = cwd.join(&file); let stripped = normalized - .strip_prefix(&repo.working_directory_path()) + .strip_prefix(&working_directory) // TODO: error message for path arguments outside of the repo .map_err(|_| CommandError::abort(""))?; let hg_file = HgPathBuf::try_from(stripped.to_path_buf())