This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10100

rhg: Print non-absolutized path in "repository {} not found" errors
ClosedPublic

Authored by SimonSapin on Mar 3 2021, 1:24 PM.

Details

Reviewers
Alphare
marmoute
Group Reviewers
hg-reviewers
Commits
rHG562a676e255a: rhg: Print non-absolutized path in "repository {} not found" errors
Summary

… like Python does. Differences in ouput can cause tests to fail.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Mar 3 2021, 1:24 PM
baymax updated this revision to Diff 26074.Mar 4 2021, 8:00 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Mar 5 2021, 3:58 AM
marmoute accepted this revision.Mar 9 2021, 1:05 PM
marmoute added a subscriber: marmoute.

(it would have been nice to have a bit more information in the description, but I grepped what I needed to understand the reason for the change.)

SimonSapin edited the summary of this revision. (Show Details)Mar 12 2021, 5:06 PM
SimonSapin updated this revision to Diff 26287.
SimonSapin added a commit: rHG562a676e255a: rhg: Print non-absolutized path in "repository {} not found" errors.Mar 16 2021, 5:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG562a676e255a: rhg: Print non-absolutized path in "repository {} not found" errors (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/repo.rs (6 lines)

Diff 26409

rust/hg-core/src/repo.rs

/// Having two methods would just move that `if` to almost all callers. /// Having two methods would just move that `if` to almost all callers.
pub fn find( pub fn find(
config: &Config, config: &Config,
explicit_path: Option<&Path>, explicit_path: Option<&Path>,
) -> Result<Self, RepoError> { ) -> Result<Self, RepoError> {
if let Some(root) = explicit_path { if let Some(root) = explicit_path {
// Having an absolute path isn’t necessary here but can help code // Having an absolute path isn’t necessary here but can help code
// elsewhere // elsewhere
let root = current_dir()?.join(root); let absolute_root = current_dir()?.join(root);
if root.join(".hg").is_dir() { if absolute_root.join(".hg").is_dir() {
Self::new_at_path(root, config) Self::new_at_path(absolute_root, config)
} else { } else {
Err(RepoError::NotFound { Err(RepoError::NotFound {
at: root.to_owned(), at: root.to_owned(),
}) })
} }
} else { } else {
let current_directory = crate::utils::current_dir()?; let current_directory = crate::utils::current_dir()?;
// ancestors() is inclusive: it first yields `current_directory` // ancestors() is inclusive: it first yields `current_directory`