This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12162

rhg: enable `rhg status` by default, without config or env opt-in
ClosedPublic

Authored by SimonSapin on Feb 10 2022, 2:16 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG29eb80d190b2: rhg: enable `rhg status` by default, without config or env opt-in
Summary

The full test suite now passes with hg pointing to rhg.

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.

Revision Contents
Changeset List

Diff 32161

rust/hg-core/src/config/config.rs

b"rhg", b"rhg",
b"on-unsupported", b"on-unsupported",
); );
config.add_for_environment_variable( config.add_for_environment_variable(
"RHG_FALLBACK_EXECUTABLE", "RHG_FALLBACK_EXECUTABLE",
b"rhg", b"rhg",
b"fallback-executable", b"fallback-executable",
); );
config.add_for_environment_variable("RHG_STATUS", b"rhg", b"status");
// HGRCPATH replaces user config // HGRCPATH replaces user config
if opt_rc_path.is_none() { if opt_rc_path.is_none() {
config.add_user_config()? config.add_user_config()?
} }
if let Some(rc_path) = &opt_rc_path { if let Some(rc_path) = &opt_rc_path {
for path in env::split_paths(rc_path) { for path in env::split_paths(rc_path) {
if !path.as_os_str().is_empty() { if !path.as_os_str().is_empty() {

rust/rhg/src/commands/status.rs

|| self.clean || self.clean
|| self.deleted || self.deleted
|| self.unknown || self.unknown
|| self.ignored) || self.ignored)
} }
} }
pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { 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 // TODO: lift these limitations
if invocation.config.get_bool(b"ui", b"tweakdefaults")? { if invocation.config.get_bool(b"ui", b"tweakdefaults")? {
return Err(CommandError::unsupported( return Err(CommandError::unsupported(
"ui.tweakdefaults is not yet supported with rhg status", "ui.tweakdefaults is not yet supported with rhg status",
)); ));
} }
if invocation.config.get_bool(b"ui", b"statuscopies")? { if invocation.config.get_bool(b"ui", b"statuscopies")? {
return Err(CommandError::unsupported( return Err(CommandError::unsupported(

tests/run-tests.py

# Affects hghave.py # Affects hghave.py
osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1' osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1'
# Affects configuration. Alternatives would be setting configuration through # Affects configuration. Alternatives would be setting configuration through
# `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include # `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
# `--config` but that disrupts tests that print command lines and check expected # `--config` but that disrupts tests that print command lines and check expected
# output. # output.
osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback' osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg
osenvironb[b'RHG_STATUS'] = b'1'
else: else:
# drop flag for hghave # drop flag for hghave
osenvironb.pop(b'RHG_INSTALLED_AS_HG', None) osenvironb.pop(b'RHG_INSTALLED_AS_HG', None)
if self.options.rhg: if self.options.rhg:
self._hgcommand = b'rhg' self._hgcommand = b'rhg'
elif self.options.with_rhg: elif self.options.with_rhg:
rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg)) rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
self._hgcommand = os.path.basename(self.options.with_rhg) self._hgcommand = os.path.basename(self.options.with_rhg)