This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10186

rhg: Add environment variables for fallback configuration
ClosedPublic

Authored by SimonSapin on Mar 12 2021, 5:06 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG08a35cec14d4: rhg: Add environment variables for fallback configuration
Summary

For the rust-tests.py --rhg we want every hg command in tests
to run rhg with fallback enabled, but other methods of setting
configuration are limited or disruptive as discussed in code comment.

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

SimonSapin created this revision.Mar 12 2021, 5:06 PM
marmoute accepted this revision.Mar 15 2021, 5:32 AM
marmoute added a subscriber: marmoute.

(should we document these somewhere?)

SimonSapin added a comment.Mar 15 2021, 6:54 AM

Yes, absolutely. The new configuration keys and their values too. However this is split between several patches that I feel are not quite settled yet, so it’ll be easier to start writing docs after this patch series has been merged.

SimonSapin added a commit: rHG08a35cec14d4: rhg: Add environment variables for fallback configuration.Mar 16 2021, 5:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG08a35cec14d4: rhg: Add environment variables for fallback configuration (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/config/config.rs (18 lines)

Diff 26403

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

cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>, cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>,
) -> Result<Self, ConfigError> { ) -> Result<Self, ConfigError> {
let mut config = Self { layers: Vec::new() }; let mut config = Self { layers: Vec::new() };
let opt_rc_path = env::var_os("HGRCPATH"); let opt_rc_path = env::var_os("HGRCPATH");
// HGRCPATH replaces system config // HGRCPATH replaces system config
if opt_rc_path.is_none() { if opt_rc_path.is_none() {
config.add_system_config()? config.add_system_config()?
} }
config.add_for_environment_variable("EDITOR", b"ui", b"editor"); config.add_for_environment_variable("EDITOR", b"ui", b"editor");
config.add_for_environment_variable("VISUAL", b"ui", b"editor"); config.add_for_environment_variable("VISUAL", b"ui", b"editor");
config.add_for_environment_variable("PAGER", b"pager", b"pager"); config.add_for_environment_variable("PAGER", b"pager", b"pager");
// These are set by `run-tests.py --rhg` to enable fallback for the
// entire test suite. Alternatives would be setting configuration
// through `$HGRCPATH` but some tests override that, or changing the
// `hg` shell alias to include `--config` but that disrupts tests that
// print command lines and check expected output.
config.add_for_environment_variable(
"RHG_ON_UNSUPPORTED",
b"rhg",
b"on-unsupported",
);
config.add_for_environment_variable(
"RHG_FALLBACK_EXECUTABLE",
b"rhg",
b"fallback-executable",
);
// 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() {
if path.is_dir() { if path.is_dir() {