extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-26 00:50:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cratification: Test Infrastructure Support Part One (#8335)

Browse Source 
startup nushell with no config file or env file...


This PR gives the ability to start up nushell easily with no config or
env config files
simply by passing in

```rust
nu -n
```

or

```rust
nu --no-config-file
```

A bonus is that startup times for nushell decreases FIVE fold...
From about > 50ms to less than < 10ms on average on my mac

This will enable Part II which will hopefully be the ability to
to send this flag into the nu! macro and turn off loading of the config
files...

Remember when config files are enabled the nu-cmd-lang tests fail
because the
commands in the config files are a superset of the commands in
nu-cmd-lang...

In my preliminary tests before by zeroing out the config files the
nu-cmd-lang tests passed...

Independent of the cratification efforts I have always wanted a way
anyway to turn off loading
the config files when starting up nushell... So this accomplishes that
task...
This commit is contained in:
Michael Angerman 2023-03-06 07:36:15 -08:00 committed by GitHub
parent f7b8f97873
commit 48b4471382
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command.rs
View File

@ -101,6 +101,7 @@ pub(crate) fn parse_commandline_args(
let testbin: Option<Expression> = call.get_flag_expr("testbin"); let testbin: Option<Expression> = call.get_flag_expr("testbin");
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
let plugin_file: Option<Expression> = call.get_flag_expr("plugin-config"); let plugin_file: Option<Expression> = call.get_flag_expr("plugin-config");
let no_config_file = call.get_named_arg("no-config-file");
let config_file: Option<Expression> = call.get_flag_expr("config"); let config_file: Option<Expression> = call.get_flag_expr("config");
let env_file: Option<Expression> = call.get_flag_expr("env-config"); let env_file: Option<Expression> = call.get_flag_expr("env-config");
let log_level: Option<Expression> = call.get_flag_expr("log-level"); let log_level: Option<Expression> = call.get_flag_expr("log-level");
@ -174,6 +175,7 @@ pub(crate) fn parse_commandline_args(
testbin, testbin,
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
plugin_file, plugin_file,
no_config_file,
config_file, config_file,
env_file, env_file,
log_level, log_level,
@ -205,6 +207,7 @@ pub(crate) struct NushellCliArgs {
pub(crate) testbin: Option<Spanned<String>>, pub(crate) testbin: Option<Spanned<String>>,
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
pub(crate) plugin_file: Option<Spanned<String>>, pub(crate) plugin_file: Option<Spanned<String>>,
pub(crate) no_config_file: Option<Spanned<String>>,
pub(crate) config_file: Option<Spanned<String>>, pub(crate) config_file: Option<Spanned<String>>,
pub(crate) env_file: Option<Spanned<String>>, pub(crate) env_file: Option<Spanned<String>>,
pub(crate) log_level: Option<Spanned<String>>, pub(crate) log_level: Option<Spanned<String>>,
@ -245,6 +248,11 @@ impl Command for Nu {
"the table mode to use. rounded is default.", "the table mode to use. rounded is default.",
Some('m'), Some('m'),
) )
.switch(
"no-config-file",
"start with no config file and no env file",
Some('n'),
)
.named( .named(
"threads", "threads",
SyntaxShape::Int, SyntaxShape::Int,

21
src/run.rs
View File

@ -201,15 +201,18 @@ pub(crate) fn run_repl(
let mut stack = nu_protocol::engine::Stack::new(); let mut stack = nu_protocol::engine::Stack::new();
let start_time = std::time::Instant::now(); let start_time = std::time::Instant::now();
setup_config( if parsed_nu_cli_args.no_config_file.is_none() {
&mut engine_state, setup_config(
&mut stack, &mut engine_state,
#[cfg(feature = "plugin")] &mut stack,
parsed_nu_cli_args.plugin_file, #[cfg(feature = "plugin")]
parsed_nu_cli_args.config_file, parsed_nu_cli_args.plugin_file,
parsed_nu_cli_args.env_file, parsed_nu_cli_args.config_file,
parsed_nu_cli_args.login_shell.is_some(), parsed_nu_cli_args.env_file,
); parsed_nu_cli_args.login_shell.is_some(),
);
}
// Reload use_color from config in case it's different from the default value // Reload use_color from config in case it's different from the default value
let use_color = engine_state.get_config().use_ansi_coloring; let use_color = engine_state.get_config().use_ansi_coloring;
perf( perf(