This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11723

rhg: make it possible to opt out of `rhg cat`
ClosedPublic

Authored by aalekseyev on Oct 27 2021, 2:37 PM.

Details

Reviewers
spectral
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHG698b70b9e8ea: rhg: make it possible to opt out of `rhg cat`
Summary

The reason an opt-out is needed is that there are still behavior
differences between rhg cat and hg cat:

  • it does not interpret relative paths correctly
  • it does not interpret patterns correctly, e.g. 're:foobar$' would be interpreted as a verbatim filename
  • it does not implement the correct semantics of relpath matcher: if given a directory, hg concatenates all files in this directory, while rhg simply complains

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

aalekseyev created this revision.Oct 27 2021, 2:37 PM
aalekseyev edited the summary of this revision. (Show Details)Oct 27 2021, 2:42 PM
aalekseyev updated this revision to Diff 30996.
aalekseyev added a comment.Oct 27 2021, 2:53 PM

The first two bullet points from the description should not be hard to fix (in fact I have a draft fix), but when we ran into the third bullet point we realized that we just want to disable hg cat for now in our setup.

aalekseyev retitled this revision from rhg: make it possible to opt out of [rhg cat] to rhg: make it possible to opt out of `rhg cat`.Oct 27 2021, 2:54 PM
aalekseyev edited the summary of this revision. (Show Details)
spectral accepted this revision.Oct 29 2021, 4:29 PM
SimonSapin accepted this revision.Nov 2 2021, 5:47 AM
aalekseyev added a commit: rHG698b70b9e8ea: rhg: make it possible to opt out of `rhg cat`.Nov 9 2021, 10:02 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG698b70b9e8ea: rhg: make it possible to opt out of `rhg cat` (authored by aalekseyev). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/cat.rs (9 lines)

Diff 31040

rust/rhg/src/commands/cat.rs

.value_name("FILE") .value_name("FILE")
.help("Files to output"), .help("Files to output"),
) )
.about(HELP_TEXT) .about(HELP_TEXT)
} }
#[timed] #[timed]
pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> {
let cat_enabled_default = true;
let cat_enabled = invocation.config.get_option(b"rhg", b"cat")?;
if !cat_enabled.unwrap_or(cat_enabled_default) {
return Err(CommandError::unsupported(
"cat is disabled in rhg (enable it with 'rhg.cat = true' \
or enable fallback with 'rhg.on-unsupported = fallback')",
));
}
let rev = invocation.subcommand_args.value_of("rev"); let rev = invocation.subcommand_args.value_of("rev");
let file_args = match invocation.subcommand_args.values_of("files") { let file_args = match invocation.subcommand_args.values_of("files") {
Some(files) => files.collect(), Some(files) => files.collect(),
None => vec![], None => vec![],
}; };
let repo = invocation.repo?; let repo = invocation.repo?;
let cwd = hg::utils::current_dir()?; let cwd = hg::utils::current_dir()?;