This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11378

rhg-cat: fallback when detecting `.` or `..` path segments
ClosedPublic

Authored by Alphare on Sep 1 2021, 12:42 PM.

Details

Reviewers
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHG1e00834491a5: rhg-cat: fallback when detecting `.` or `..` path segments
Summary

We do not normalize paths correctly yet, so exclude the shortcuts.

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

Alphare created this revision.Sep 1 2021, 12:42 PM
SimonSapin added a subscriber: SimonSapin.Sep 2 2021, 2:40 PM

Is https://doc.rust-lang.org/std/fs/fn.canonicalize.html the correct normalization needed here? (Note that it follows symlinks.) If it’s easy enough, it may be worth implementing the correct behavior instead of adding fallback.

Alphare added a comment.Sep 3 2021, 5:27 AM
In D11378#174748, @SimonSapin wrote:

Is https://doc.rust-lang.org/std/fs/fn.canonicalize.html the correct normalization needed here? (Note that it follows symlinks.) If it’s easy enough, it may be worth implementing the correct behavior instead of adding fallback.

This wouldn't work since the normalization must be independent from the fs. You can have hg cat -r 1 file_that_was_deleted_since_then, we need to use HgPath type normalization.

SimonSapin accepted this revision.Sep 9 2021, 9:36 AM

Ok. The correct normalization can be added later, let’s not block this patch.

Alphare added a commit: rHG1e00834491a5: rhg-cat: fallback when detecting `.` or `..` path segments.Oct 1 2021, 9:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1e00834491a5: rhg-cat: fallback when detecting `.` or `..` path segments (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/cat.rs (7 lines)
Mtests/test-rhg.t (11 lines)

Diff 30489

rust/rhg/src/commands/cat.rs

let repo = invocation.repo?; let repo = invocation.repo?;
let cwd = hg::utils::current_dir()?; let cwd = hg::utils::current_dir()?;
let working_directory = repo.working_directory_path(); let working_directory = repo.working_directory_path();
let working_directory = cwd.join(working_directory); // Make it absolute let working_directory = cwd.join(working_directory); // Make it absolute
let mut files = vec![]; let mut files = vec![];
for file in file_args.iter() { for file in file_args.iter() {
// TODO: actually normalize `..` path segments etc?
let normalized = cwd.join(&file); let normalized = cwd.join(&file);
// TODO: actually normalize `..` path segments etc?
let dotted = normalized.components().any(|c| c.as_os_str() == "..");
if file == &"." || dotted {
let message = "`..` or `.` path segment";
return Err(CommandError::unsupported(message));
}
let stripped = normalized let stripped = normalized
.strip_prefix(&working_directory) .strip_prefix(&working_directory)
// TODO: error message for path arguments outside of the repo // TODO: error message for path arguments outside of the repo
.map_err(|_| CommandError::abort(""))?; .map_err(|_| CommandError::abort(""))?;
let hg_file = HgPathBuf::try_from(stripped.to_path_buf()) let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
.map_err(|e| CommandError::abort(e.to_string()))?; .map_err(|e| CommandError::abort(e.to_string()))?;
files.push(hg_file); files.push(hg_file);
} }

tests/test-rhg.t

USAGE: USAGE:
rhg cat [OPTIONS] <FILE>... rhg cat [OPTIONS] <FILE>...
For more information try --help For more information try --help
[252] [252]
Fallback with shell path segments
$ $NO_FALLBACK rhg cat .
unsupported feature: `..` or `.` path segment
[252]
$ $NO_FALLBACK rhg cat ..
unsupported feature: `..` or `.` path segment
[252]
$ $NO_FALLBACK rhg cat ../..
unsupported feature: `..` or `.` path segment
[252]
Requirements Requirements
$ $NO_FALLBACK rhg debugrequirements $ $NO_FALLBACK rhg debugrequirements
dotencode dotencode
fncache fncache
generaldelta generaldelta
persistent-nodemap persistent-nodemap
revlog-compression-zstd (zstd !) revlog-compression-zstd (zstd !)
revlogv1 revlogv1