( )⚙ D10092 rhg: Change default `rhg.on-unsupported` configuration to `abort`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10092

rhg: Change default `rhg.on-unsupported` configuration to `abort`
AbandonedPublic

Authored by SimonSapin on Mar 2 2021, 2:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

SimonSapin created this revision.Mar 2 2021, 2:58 PM
pulkit added a subscriber: pulkit.Mar 4 2021, 4:09 AM

This one can be folded in the previous patch.

SimonSapin added a comment.Mar 4 2021, 6:06 AM

Sure, I meant to show separately the impact of the change on the test suite but they turned out to be fewer than I expected. I’ll fold it if you prefer that way.

SimonSapin abandoned this revision.Mar 4 2021, 6:12 AM

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (2 lines)
Mtests/test-rhg.t (7 lines)

Diff 26026

rust/rhg/src/main.rs

/// and exit with code 252. /// and exit with code 252.
Abort, Abort,
/// Silently exit with code 252. /// Silently exit with code 252.
AbortSilent, AbortSilent,
} }
impl OnUnsupported { impl OnUnsupported {
fn from_config(config: &Config) -> Self { fn from_config(config: &Config) -> Self {
let default = OnUnsupported::AbortSilent; let default = OnUnsupported::Abort;
match config.get(b"rhg", b"on-unsupported") { match config.get(b"rhg", b"on-unsupported") {
Some(b"abort") => OnUnsupported::Abort, Some(b"abort") => OnUnsupported::Abort,
Some(b"abort-silent") => OnUnsupported::AbortSilent, Some(b"abort-silent") => OnUnsupported::AbortSilent,
None => default, None => default,
Some(_) => { Some(_) => {
// TODO: warn about unknown config value // TODO: warn about unknown config value
default default
} }
} }
} }
} }

tests/test-rhg.t

#require rust #require rust
Define an rhg function that will only run if rhg exists Define an rhg function that will only run if rhg exists
$ rhg() { $ rhg() {
> if [ -f "$RUNTESTDIR/../rust/target/release/rhg" ]; then > if [ -f "$RUNTESTDIR/../rust/target/release/rhg" ]; then
> "$RUNTESTDIR/../rust/target/release/rhg" "$@" > "$RUNTESTDIR/../rust/target/release/rhg" "$@"
> else > else
> echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg." > echo "skipped: Cannot find rhg. Try to run cargo build in rust/rhg."
> exit 80 > exit 80
> fi > fi
> } > }
Unimplemented command Unimplemented command
$ rhg unimplemented-command $ rhg unimplemented-command
[252]
$ rhg unimplemented-command --config rhg.on-unsupported=abort
unsupported feature: error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context unsupported feature: error: Found argument 'unimplemented-command' which wasn't expected, or isn't valid in this context
USAGE: USAGE:
rhg [OPTIONS] <SUBCOMMAND> rhg [OPTIONS] <SUBCOMMAND>
For more information try --help For more information try --help
[252] [252]
$ rhg unimplemented-command --config rhg.on-unsupported=abort-silent
[252]
Finding root Finding root
$ rhg root $ rhg root
abort: no repository found in '$TESTTMP' (.hg not found)! abort: no repository found in '$TESTTMP' (.hg not found)!
[255] [255]
$ hg init repository $ hg init repository
$ cd repository $ cd repository
fncache fncache
generaldelta generaldelta
revlogv1 revlogv1
sparserevlog sparserevlog
store store
$ echo indoor-pool >> .hg/requires $ echo indoor-pool >> .hg/requires
$ rhg files $ rhg files
unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool
[252] [252]
$ rhg cat -r 1 copy_of_original $ rhg cat -r 1 copy_of_original
unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool
[252] [252]
$ rhg debugrequirements $ rhg debugrequirements
unsupported feature: repository requires feature unknown to this Mercurial: indoor-pool
[252] [252]
$ echo -e '\xFF' >> .hg/requires $ echo -e '\xFF' >> .hg/requires
$ rhg debugrequirements $ rhg debugrequirements
abort: corrupted repository: parse error in 'requires' file abort: corrupted repository: parse error in 'requires' file
[255] [255]
Persistent nodemap Persistent nodemap