mirror of
https://github.com/nushell/nushell.git
synced 2025-05-17 05:04:34 +00:00
This is the first PR towards migrating to a new `$env.PWD` API that returns potentially un-canonicalized paths. Refer to PR #12515 for motivations. ## New API: `EngineState::cwd()` The goal of the new API is to cover both parse-time and runtime use case, and avoid unintentional misuse. It takes an `Option<Stack>` as argument, which if supplied, will search for `$env.PWD` on the stack in additional to the engine state. I think with this design, there's less confusion over parse-time and runtime environments. If you have access to a stack, just supply it; otherwise supply `None`. ## Deprecation of other PWD-related APIs Other APIs are re-implemented using `EngineState::cwd()` and properly documented. They're marked deprecated, but their behavior is unchanged. Unused APIs are deleted, and code that accesses `$env.PWD` directly without using an API is rewritten. Deprecated APIs: * `EngineState::current_work_dir()` * `StateWorkingSet::get_cwd()` * `env::current_dir()` * `env::current_dir_str()` * `env::current_dir_const()` * `env::current_dir_str_const()` Other changes: * `EngineState::get_cwd()` (deleted) * `StateWorkingSet::list_env()` (deleted) * `repl::do_run_cmd()` (rewritten with `env::current_dir_str()`) ## `cd` and `pwd` now use logical paths by default This pulls the changes from PR #12515. It's currently somewhat broken because using non-canonicalized paths exposed a bug in our path normalization logic (Issue #12602). Once that is fixed, this should work. ## Future plans This PR needs some tests. Which test helpers should I use, and where should I put those tests? I noticed that unquoted paths are expanded within `eval_filepath()` and `eval_directory()` before they even reach the `cd` command. This means every paths is expanded twice. Is this intended? Once this PR lands, the plan is to review all usages of the deprecated APIs and migrate them to `EngineState::cwd()`. In the meantime, these usages are annotated with `#[allow(deprecated)]` to avoid breaking CI. --------- Co-authored-by: Jakub Žádník <kubouch@gmail.com>
141 lines
5.1 KiB
Rust
141 lines
5.1 KiB
Rust
use nu_engine::command_prelude::*;
|
|
use nu_utils::filesystem::{have_permission, PermissionResult};
|
|
|
|
#[derive(Clone)]
|
|
pub struct Cd;
|
|
|
|
impl Command for Cd {
|
|
fn name(&self) -> &str {
|
|
"cd"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Change directory."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["change", "directory", "dir", "folder", "switch"]
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("cd")
|
|
.input_output_types(vec![(Type::Nothing, Type::Nothing)])
|
|
.switch("physical", "use the physical directory structure; resolve symbolic links before processing instances of ..", Some('P'))
|
|
.optional("path", SyntaxShape::Directory, "The path to change to.")
|
|
.input_output_types(vec![
|
|
(Type::Nothing, Type::Nothing),
|
|
(Type::String, Type::Nothing),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.category(Category::FileSystem)
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let physical = call.has_flag(engine_state, stack, "physical")?;
|
|
let path_val: Option<Spanned<String>> = call.opt(engine_state, stack, 0)?;
|
|
let cwd = engine_state.cwd(Some(stack))?;
|
|
|
|
let path_val = {
|
|
if let Some(path) = path_val {
|
|
Some(Spanned {
|
|
item: nu_utils::strip_ansi_string_unlikely(path.item),
|
|
span: path.span,
|
|
})
|
|
} else {
|
|
path_val
|
|
}
|
|
};
|
|
|
|
let (path, span) = match path_val {
|
|
Some(v) => {
|
|
if v.item == "-" {
|
|
if let Some(oldpwd) = stack.get_env_var(engine_state, "OLDPWD") {
|
|
(oldpwd.to_path()?, v.span)
|
|
} else {
|
|
(cwd, v.span)
|
|
}
|
|
} else {
|
|
// Trim whitespace from the end of path.
|
|
let path_no_whitespace =
|
|
&v.item.trim_end_matches(|x| matches!(x, '\x09'..='\x0d'));
|
|
|
|
// If `--physical` is specified, canonicalize the path; otherwise expand the path.
|
|
let path = if physical {
|
|
if let Ok(path) = nu_path::canonicalize_with(path_no_whitespace, &cwd) {
|
|
if !path.is_dir() {
|
|
return Err(ShellError::NotADirectory { span: v.span });
|
|
};
|
|
path
|
|
} else {
|
|
return Err(ShellError::DirectoryNotFound {
|
|
dir: path_no_whitespace.to_string(),
|
|
span: v.span,
|
|
});
|
|
}
|
|
} else {
|
|
let path = nu_path::expand_path_with(path_no_whitespace, &cwd, true);
|
|
if !path.exists() {
|
|
return Err(ShellError::DirectoryNotFound {
|
|
dir: path_no_whitespace.to_string(),
|
|
span: v.span,
|
|
});
|
|
};
|
|
if !path.is_dir() {
|
|
return Err(ShellError::NotADirectory { span: v.span });
|
|
};
|
|
path
|
|
};
|
|
(path, v.span)
|
|
}
|
|
}
|
|
None => {
|
|
let path = nu_path::expand_tilde("~");
|
|
(path, call.head)
|
|
}
|
|
};
|
|
|
|
// Set OLDPWD.
|
|
// We're using `Stack::get_env_var()` instead of `EngineState::cwd()` to avoid a conversion roundtrip.
|
|
if let Some(oldpwd) = stack.get_env_var(engine_state, "PWD") {
|
|
stack.add_env_var("OLDPWD".into(), oldpwd)
|
|
}
|
|
|
|
match have_permission(&path) {
|
|
//FIXME: this only changes the current scope, but instead this environment variable
|
|
//should probably be a block that loads the information from the state in the overlay
|
|
PermissionResult::PermissionOk => {
|
|
stack.add_env_var("PWD".into(), Value::string(path.to_string_lossy(), span));
|
|
Ok(PipelineData::empty())
|
|
}
|
|
PermissionResult::PermissionDenied(reason) => Err(ShellError::IOError {
|
|
msg: format!(
|
|
"Cannot change directory to {}: {}",
|
|
path.to_string_lossy(),
|
|
reason
|
|
),
|
|
}),
|
|
}
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Change to your home directory",
|
|
example: r#"cd ~"#,
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Change to the previous working directory ($OLDPWD)",
|
|
example: r#"cd -"#,
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|