Show More
@@ -119,7 +119,6 b' impl Config {' | |||||
119 | b"rhg", |
|
119 | b"rhg", | |
120 | b"fallback-executable", |
|
120 | b"fallback-executable", | |
121 | ); |
|
121 | ); | |
122 | config.add_for_environment_variable("RHG_STATUS", b"rhg", b"status"); |
|
|||
123 |
|
122 | |||
124 | // HGRCPATH replaces user config |
|
123 | // HGRCPATH replaces user config | |
125 | if opt_rc_path.is_none() { |
|
124 | if opt_rc_path.is_none() { |
@@ -149,15 +149,6 b' impl DisplayStates {' | |||||
149 | } |
|
149 | } | |
150 |
|
150 | |||
151 | pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { |
|
151 | pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { | |
152 | let status_enabled_default = false; |
|
|||
153 | let status_enabled = invocation.config.get_option(b"rhg", b"status")?; |
|
|||
154 | if !status_enabled.unwrap_or(status_enabled_default) { |
|
|||
155 | return Err(CommandError::unsupported( |
|
|||
156 | "status is experimental in rhg (enable it with 'rhg.status = true' \ |
|
|||
157 | or enable fallback with 'rhg.on-unsupported = fallback')" |
|
|||
158 | )); |
|
|||
159 | } |
|
|||
160 |
|
||||
161 | // TODO: lift these limitations |
|
152 | // TODO: lift these limitations | |
162 | if invocation.config.get_bool(b"ui", b"tweakdefaults")? { |
|
153 | if invocation.config.get_bool(b"ui", b"tweakdefaults")? { | |
163 | return Err(CommandError::unsupported( |
|
154 | return Err(CommandError::unsupported( |
@@ -3228,7 +3228,6 b' class TestRunner(object):' | |||||
3228 | # output. |
|
3228 | # output. | |
3229 | osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback' |
|
3229 | osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback' | |
3230 | osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg |
|
3230 | osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg | |
3231 | osenvironb[b'RHG_STATUS'] = b'1' |
|
|||
3232 | else: |
|
3231 | else: | |
3233 | # drop flag for hghave |
|
3232 | # drop flag for hghave | |
3234 | osenvironb.pop(b'RHG_INSTALLED_AS_HG', None) |
|
3233 | osenvironb.pop(b'RHG_INSTALLED_AS_HG', None) |
General Comments 0
You need to be logged in to leave comments.
Login now