Mercurial > public > mercurial-scm > hg-stable
diff rust/rhg/src/utils/path_utils.rs @ 48186:9ecf802b06e0
rhg: refactor function to relativize paths in utils
Commands like `files`, `status` supports printing relative paths. Hence we need
to re-use this code in other places too. So let's take this out from `rhg files`
into a utility function.
Next patch will make `rhg status` use it.
Differential Revision: https://phab.mercurial-scm.org/D11613
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 05 Oct 2021 18:02:22 +0530 |
parents | |
children | 10c32e1b892a |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rust/rhg/src/utils/path_utils.rs Tue Oct 05 18:02:22 2021 +0530 @@ -0,0 +1,48 @@ +// path utils module +// +// This software may be used and distributed according to the terms of the +// GNU General Public License version 2 or any later version. + +use crate::error::CommandError; +use crate::ui::UiError; +use hg::repo::Repo; +use hg::utils::current_dir; +use hg::utils::files::{get_bytes_from_path, relativize_path}; +use hg::utils::hg_path::HgPath; +use hg::utils::hg_path::HgPathBuf; +use std::borrow::Cow; + +pub fn relativize_paths( + repo: &Repo, + paths: impl IntoIterator<Item = impl AsRef<HgPath>>, + mut callback: impl FnMut(Cow<[u8]>) -> Result<(), UiError>, +) -> Result<(), CommandError> { + let cwd = current_dir()?; + let repo_root = repo.working_directory_path(); + let repo_root = cwd.join(repo_root); // Make it absolute + let repo_root_hgpath = + HgPathBuf::from(get_bytes_from_path(repo_root.to_owned())); + let outside_repo: bool; + let cwd_hgpath: HgPathBuf; + + if let Ok(cwd_relative_to_repo) = cwd.strip_prefix(&repo_root) { + // The current directory is inside the repo, so we can work with + // relative paths + outside_repo = false; + cwd_hgpath = + HgPathBuf::from(get_bytes_from_path(cwd_relative_to_repo)); + } else { + outside_repo = true; + cwd_hgpath = HgPathBuf::from(get_bytes_from_path(cwd)); + } + + for file in paths { + if outside_repo { + let file = repo_root_hgpath.join(file.as_ref()); + callback(relativize_path(&file, &cwd_hgpath))?; + } else { + callback(relativize_path(file.as_ref(), &cwd_hgpath))?; + } + } + Ok(()) +}