mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 22:50:14 +02:00
Unify glob behavior on open
, rm
, cp-old
, mv
, umv
, cp
and du
commands (#11621)
# Description This pr is a follow up to [#11569](https://github.com/nushell/nushell/pull/11569#issuecomment-1902279587) > Revert the logic in https://github.com/nushell/nushell/pull/10694 and apply the logic in this pr to mv, cp, rv will require a larger change, I need to think how to achieve the bahavior And sorry @bobhy for reverting some of your changes. This pr is going to unify glob behavior on the given commands: * open * rm * cp-old * mv * umv * cp * du So they have the same behavior to `ls`, which is: If given parameter is quoted by single quote(`'`) or double quote(`"`), don't auto-expand the glob pattern. If not quoted, auto-expand the glob pattern. Fixes: #9558 Fixes: #10211 Fixes: #9310 Fixes: #10364 # TODO But there is one thing remains: if we give a variable to the command, it will always auto-expand the glob pattern, e.g: ```nushell let path = "a[123]b" rm $path ``` I don't think it's expected. But I also think user might want to auto-expand the glob pattern in variables. So I'll introduce a new command called `glob escape`, then if user doesn't want to auto-expand the glob pattern, he can just do this: `rm ($path | glob escape)` # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting Done # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> ## NOTE This pr changes the semantic of `GlobPattern`, before this pr, it will `expand path` after evaluated, this makes `nu_engine::glob_from` have no chance to glob things right if a path contains glob pattern. e.g: [#9310 ](https://github.com/nushell/nushell/issues/9310#issuecomment-1886824030) #10211 I think changing the semantic is fine, because it makes glob works if path contains something like '*'. It maybe a breaking change if a custom command's argument are annotated by `: glob`.
This commit is contained in:
@ -204,7 +204,7 @@ fn errors_if_source_doesnt_exist() {
|
||||
cwd: dirs.test(),
|
||||
"umv non-existing-file test_folder/"
|
||||
);
|
||||
assert!(actual.err.contains("file not found"));
|
||||
assert!(actual.err.contains("Directory not found"));
|
||||
})
|
||||
}
|
||||
|
||||
@ -559,10 +559,10 @@ fn mv_with_no_target() {
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
#[case(r#"'a]c'"#)]
|
||||
#[case(r#"'a[c'"#)]
|
||||
#[case(r#"'a[bc]d'"#)]
|
||||
#[case(r#"'a][c'"#)]
|
||||
#[case("a]c")]
|
||||
#[case("a[c")]
|
||||
#[case("a[bc]d")]
|
||||
#[case("a][c")]
|
||||
fn mv_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
Playground::setup("umv_test_16", |dirs, sandbox| {
|
||||
sandbox.with_files(vec![FileWithContent(
|
||||
@ -574,7 +574,7 @@ fn mv_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(),
|
||||
"umv {} {}",
|
||||
"umv '{}' {}",
|
||||
src.display(),
|
||||
"hello_world_dest"
|
||||
);
|
||||
@ -586,8 +586,8 @@ fn mv_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
|
||||
#[cfg(not(windows))]
|
||||
#[rstest]
|
||||
#[case(r#"'a]?c'"#)]
|
||||
#[case(r#"'a*.?c'"#)]
|
||||
#[case("a]?c")]
|
||||
#[case("a*.?c")]
|
||||
// windows doesn't allow filename with `*`.
|
||||
fn mv_files_with_glob_metachars_nw(#[case] src_name: &str) {
|
||||
mv_files_with_glob_metachars(src_name);
|
||||
@ -607,3 +607,25 @@ fn mv_with_cd() {
|
||||
assert!(actual.out.contains("body"));
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cp_inside_glob_metachars_dir() {
|
||||
Playground::setup("open_files_inside_glob_metachars_dir", |dirs, sandbox| {
|
||||
let sub_dir = "test[]";
|
||||
sandbox
|
||||
.within(sub_dir)
|
||||
.with_files(vec![FileWithContent("test_file.txt", "hello")]);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test().join(sub_dir),
|
||||
"mv test_file.txt ../",
|
||||
);
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
assert!(!files_exist_at(
|
||||
vec!["test_file.txt"],
|
||||
dirs.test().join(sub_dir)
|
||||
));
|
||||
assert!(files_exist_at(vec!["test_file.txt"], dirs.test()));
|
||||
});
|
||||
}
|
||||
|
@ -3,6 +3,7 @@ use nu_test_support::fs::Stub::FileWithContent;
|
||||
use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
|
||||
use nu_test_support::playground::Playground;
|
||||
use nu_test_support::{nu, pipeline};
|
||||
use rstest::rstest;
|
||||
|
||||
#[test]
|
||||
fn parses_file_with_uppercase_extension() {
|
||||
@ -336,3 +337,52 @@ fn open_no_parameter() {
|
||||
|
||||
assert!(actual.err.contains("needs filename"));
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
#[case("a]c")]
|
||||
#[case("a[c")]
|
||||
#[case("a[bc]d")]
|
||||
#[case("a][c")]
|
||||
fn open_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
Playground::setup("open_test_with_glob_metachars", |dirs, sandbox| {
|
||||
sandbox.with_files(vec![FileWithContent(src_name, "hello")]);
|
||||
|
||||
let src = dirs.test().join(src_name);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(),
|
||||
"open '{}'",
|
||||
src.display(),
|
||||
);
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
assert!(actual.out.contains("hello"));
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
#[rstest]
|
||||
#[case("a]?c")]
|
||||
#[case("a*.?c")]
|
||||
// windows doesn't allow filename with `*`.
|
||||
fn open_files_with_glob_metachars_nw(#[case] src_name: &str) {
|
||||
open_files_with_glob_metachars(src_name);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn open_files_inside_glob_metachars_dir() {
|
||||
Playground::setup("open_files_inside_glob_metachars_dir", |dirs, sandbox| {
|
||||
let sub_dir = "test[]";
|
||||
sandbox
|
||||
.within(sub_dir)
|
||||
.with_files(vec![FileWithContent("test_file.txt", "hello")]);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test().join(sub_dir),
|
||||
"open test_file.txt",
|
||||
);
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
assert!(actual.out.contains("hello"));
|
||||
});
|
||||
}
|
||||
|
@ -1,4 +1,6 @@
|
||||
use nu_test_support::{nu, pipeline};
|
||||
use nu_test_support::fs::Stub::EmptyFile;
|
||||
use nu_test_support::{nu, pipeline, playground::Playground};
|
||||
use rstest::rstest;
|
||||
|
||||
#[test]
|
||||
fn test_du_flag_min_size() {
|
||||
@ -41,3 +43,33 @@ fn test_du_flag_max_depth() {
|
||||
));
|
||||
assert!(actual.err.is_empty());
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
#[case("a]c")]
|
||||
#[case("a[c")]
|
||||
#[case("a[bc]d")]
|
||||
#[case("a][c")]
|
||||
fn du_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
Playground::setup("umv_test_16", |dirs, sandbox| {
|
||||
sandbox.with_files(vec![EmptyFile(src_name)]);
|
||||
|
||||
let src = dirs.test().join(src_name);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(),
|
||||
"du -d 1 '{}'",
|
||||
src.display(),
|
||||
);
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
#[rstest]
|
||||
#[case("a]?c")]
|
||||
#[case("a*.?c")]
|
||||
// windows doesn't allow filename with `*`.
|
||||
fn du_files_with_glob_metachars_nw(#[case] src_name: &str) {
|
||||
du_files_with_glob_metachars(src_name);
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ fn removes_files_with_wildcard() {
|
||||
|
||||
nu!(
|
||||
cwd: dirs.test(),
|
||||
r#"rm "src/*/*/*.rs""#
|
||||
r#"rm src/*/*/*.rs"#
|
||||
);
|
||||
|
||||
assert!(!files_exist_at(
|
||||
@ -459,3 +459,24 @@ fn rm_prints_filenames_on_error() {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rm_files_inside_glob_metachars_dir() {
|
||||
Playground::setup("rm_files_inside_glob_metachars_dir", |dirs, sandbox| {
|
||||
let sub_dir = "test[]";
|
||||
sandbox
|
||||
.within(sub_dir)
|
||||
.with_files(vec![EmptyFile("test_file.txt")]);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test().join(sub_dir),
|
||||
"rm test_file.txt",
|
||||
);
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
assert!(!files_exist_at(
|
||||
vec!["test_file.txt"],
|
||||
dirs.test().join(sub_dir)
|
||||
));
|
||||
});
|
||||
}
|
||||
|
@ -986,10 +986,10 @@ fn test_cp_destination_after_cd() {
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
#[case(r#"'a]c'"#)]
|
||||
#[case(r#"'a[c'"#)]
|
||||
#[case(r#"'a[bc]d'"#)]
|
||||
#[case(r#"'a][c'"#)]
|
||||
#[case("a]c")]
|
||||
#[case("a[c")]
|
||||
#[case("a[bc]d")]
|
||||
#[case("a][c")]
|
||||
fn copies_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
Playground::setup("ucp_test_34", |dirs, sandbox| {
|
||||
sandbox.with_files(vec![FileWithContent(
|
||||
@ -1005,7 +1005,7 @@ fn copies_files_with_glob_metachars(#[case] src_name: &str) {
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(),
|
||||
"cp {} {}",
|
||||
"cp '{}' {}",
|
||||
src.display(),
|
||||
TEST_HELLO_WORLD_DEST
|
||||
);
|
||||
@ -1100,3 +1100,25 @@ fn test_cp_preserve_nothing() {
|
||||
assert_eq!(actual.out, "true");
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cp_inside_glob_metachars_dir() {
|
||||
Playground::setup("open_files_inside_glob_metachars_dir", |dirs, sandbox| {
|
||||
let sub_dir = "test[]";
|
||||
sandbox
|
||||
.within(sub_dir)
|
||||
.with_files(vec![FileWithContent("test_file.txt", "hello")]);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test().join(sub_dir),
|
||||
"cp test_file.txt ../",
|
||||
);
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
assert!(files_exist_at(
|
||||
vec!["test_file.txt"],
|
||||
dirs.test().join(sub_dir)
|
||||
));
|
||||
assert!(files_exist_at(vec!["test_file.txt"], dirs.test()));
|
||||
});
|
||||
}
|
||||
|
Reference in New Issue
Block a user