Mercurial > hg
changeset 48735:29eb80d190b2
rhg: enable `rhg status` by default, without config or env opt-in
The full test suite now passes with `hg` pointing to rhg.
Differential Revision: https://phab.mercurial-scm.org/D12162
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Thu, 10 Feb 2022 19:26:10 +0100 |
| parents | 3e2b4bb286e7 |
| children | fd2cf9e0c64e |
| files | rust/hg-core/src/config/config.rs rust/rhg/src/commands/status.rs tests/run-tests.py |
| diffstat | 3 files changed, 0 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/hg-core/src/config/config.rs Tue Feb 08 14:20:58 2022 +0100 +++ b/rust/hg-core/src/config/config.rs Thu Feb 10 19:26:10 2022 +0100 @@ -119,7 +119,6 @@ b"rhg", b"fallback-executable", ); - config.add_for_environment_variable("RHG_STATUS", b"rhg", b"status"); // HGRCPATH replaces user config if opt_rc_path.is_none() {
--- a/rust/rhg/src/commands/status.rs Tue Feb 08 14:20:58 2022 +0100 +++ b/rust/rhg/src/commands/status.rs Thu Feb 10 19:26:10 2022 +0100 @@ -149,15 +149,6 @@ } pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { - let status_enabled_default = false; - let status_enabled = invocation.config.get_option(b"rhg", b"status")?; - if !status_enabled.unwrap_or(status_enabled_default) { - return Err(CommandError::unsupported( - "status is experimental in rhg (enable it with 'rhg.status = true' \ - or enable fallback with 'rhg.on-unsupported = fallback')" - )); - } - // TODO: lift these limitations if invocation.config.get_bool(b"ui", b"tweakdefaults")? { return Err(CommandError::unsupported(
--- a/tests/run-tests.py Tue Feb 08 14:20:58 2022 +0100 +++ b/tests/run-tests.py Thu Feb 10 19:26:10 2022 +0100 @@ -3228,7 +3228,6 @@ # output. osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback' osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg - osenvironb[b'RHG_STATUS'] = b'1' else: # drop flag for hghave osenvironb.pop(b'RHG_INSTALLED_AS_HG', None)