Initial implementation of umv from uutils (#10822)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
This closes #10446 , wherein we start implementing `mv` from `uutils`.
There are some stuff to iron out, particularly
* Decide on behavior from ignored tests
* Wait for release/PRs to be approved on `uutils` side, but still can be
tested for now. See [PR
approved](https://github.com/uutils/coreutils/pull/5428), and
[pending](https://github.com/uutils/coreutils/pull/5429).
* `--progress` does not seem to work on `uutils mv` either and have not
checked whether certain `X` size has to be achieved in order for it to
appear, thus something to investigate as well, but thought it wasnt
important enough to not make the PR.
See [issue
comment](https://github.com/nushell/nushell/issues/10446#issuecomment-1764497988),
on the possible strategy to follow, mainly copy what we did with `ucp`.
I still left some comments on purpose particularly on tests, which of
course would be removed before something is decided here. :) @fdncred
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [X] `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
# 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.
-->
2024-01-18 17:20:57 +01:00
|
|
|
use nu_test_support::fs::{files_exist_at, Stub::EmptyFile, Stub::FileWithContent};
|
|
|
|
use nu_test_support::nu;
|
|
|
|
use nu_test_support::playground::Playground;
|
|
|
|
use rstest::rstest;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_a_file() {
|
|
|
|
Playground::setup("umv_test_1", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![EmptyFile("andres.txt")])
|
|
|
|
.mkdir("expected");
|
|
|
|
|
|
|
|
let original = dirs.test().join("andres.txt");
|
|
|
|
let expected = dirs.test().join("expected/yehuda.txt");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv andres.txt expected/yehuda.txt"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn overwrites_if_moving_to_existing_file_and_force_provided() {
|
|
|
|
Playground::setup("umv_test_2", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![EmptyFile("andres.txt"), EmptyFile("jttxt")]);
|
|
|
|
|
|
|
|
let original = dirs.test().join("andres.txt");
|
|
|
|
let expected = dirs.test().join("jttxt");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv andres.txt -f jttxt"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_a_directory() {
|
|
|
|
Playground::setup("umv_test_3", |dirs, sandbox| {
|
|
|
|
sandbox.mkdir("empty_dir");
|
|
|
|
|
|
|
|
let original_dir = dirs.test().join("empty_dir");
|
|
|
|
let expected = dirs.test().join("renamed_dir");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv empty_dir renamed_dir"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original_dir.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_the_file_inside_directory_if_path_to_move_is_existing_directory() {
|
|
|
|
Playground::setup("umv_test_4", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.with_files(vec![EmptyFile("jttxt")])
|
|
|
|
.mkdir("expected");
|
|
|
|
|
|
|
|
let original_dir = dirs.test().join("jttxt");
|
|
|
|
let expected = dirs.test().join("expected/jttxt");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv jttxt expected"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original_dir.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_the_directory_inside_directory_if_path_to_move_is_existing_directory() {
|
|
|
|
Playground::setup("umv_test_5", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.within("contributors")
|
|
|
|
.with_files(vec![EmptyFile("jttxt")])
|
|
|
|
.mkdir("expected");
|
|
|
|
|
|
|
|
let original_dir = dirs.test().join("contributors");
|
|
|
|
let expected = dirs.test().join("expected/contributors");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv contributors expected"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original_dir.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
assert!(files_exist_at(vec!["jttxt"], expected))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_using_path_with_wildcard() {
|
|
|
|
Playground::setup("umv_test_7", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.within("originals")
|
|
|
|
.with_files(vec![
|
|
|
|
EmptyFile("andres.ini"),
|
|
|
|
EmptyFile("caco3_plastics.csv"),
|
|
|
|
EmptyFile("cargo_sample.toml"),
|
|
|
|
EmptyFile("jt.ini"),
|
|
|
|
EmptyFile("jt.xml"),
|
|
|
|
EmptyFile("sgml_description.json"),
|
|
|
|
EmptyFile("sample.ini"),
|
|
|
|
EmptyFile("utf16.ini"),
|
|
|
|
EmptyFile("yehuda.ini"),
|
|
|
|
])
|
|
|
|
.mkdir("work_dir")
|
|
|
|
.mkdir("expected");
|
|
|
|
|
|
|
|
let work_dir = dirs.test().join("work_dir");
|
|
|
|
let expected = dirs.test().join("expected");
|
|
|
|
|
|
|
|
nu!(cwd: work_dir, "umv ../originals/*.ini ../expected");
|
|
|
|
|
|
|
|
assert!(files_exist_at(
|
|
|
|
vec!["yehuda.ini", "jt.ini", "sample.ini", "andres.ini",],
|
|
|
|
expected
|
|
|
|
));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_using_a_glob() {
|
|
|
|
Playground::setup("umv_test_8", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.within("meals")
|
|
|
|
.with_files(vec![
|
|
|
|
EmptyFile("arepa.txt"),
|
|
|
|
EmptyFile("empanada.txt"),
|
|
|
|
EmptyFile("taquiza.txt"),
|
|
|
|
])
|
|
|
|
.mkdir("work_dir")
|
|
|
|
.mkdir("expected");
|
|
|
|
|
|
|
|
let meal_dir = dirs.test().join("meals");
|
|
|
|
let work_dir = dirs.test().join("work_dir");
|
|
|
|
let expected = dirs.test().join("expected");
|
|
|
|
|
|
|
|
nu!(cwd: work_dir, "umv ../meals/* ../expected");
|
|
|
|
|
|
|
|
assert!(meal_dir.exists());
|
|
|
|
assert!(files_exist_at(
|
|
|
|
vec!["arepa.txt", "empanada.txt", "taquiza.txt",],
|
|
|
|
expected
|
|
|
|
));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn moves_a_directory_with_files() {
|
|
|
|
Playground::setup("umv_test_9", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("vehicles/car")
|
|
|
|
.mkdir("vehicles/bicycle")
|
|
|
|
.with_files(vec![
|
|
|
|
EmptyFile("vehicles/car/car1.txt"),
|
|
|
|
EmptyFile("vehicles/car/car2.txt"),
|
|
|
|
])
|
|
|
|
.with_files(vec![
|
|
|
|
EmptyFile("vehicles/bicycle/bicycle1.txt"),
|
|
|
|
EmptyFile("vehicles/bicycle/bicycle2.txt"),
|
|
|
|
]);
|
|
|
|
|
|
|
|
let original_dir = dirs.test().join("vehicles");
|
|
|
|
let expected_dir = dirs.test().join("expected");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv vehicles expected"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original_dir.exists());
|
|
|
|
assert!(expected_dir.exists());
|
|
|
|
assert!(files_exist_at(
|
|
|
|
vec![
|
|
|
|
"car/car1.txt",
|
|
|
|
"car/car2.txt",
|
|
|
|
"bicycle/bicycle1.txt",
|
|
|
|
"bicycle/bicycle2.txt"
|
|
|
|
],
|
|
|
|
expected_dir
|
|
|
|
));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn errors_if_source_doesnt_exist() {
|
|
|
|
Playground::setup("umv_test_10", |dirs, sandbox| {
|
|
|
|
sandbox.mkdir("test_folder");
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv non-existing-file test_folder/"
|
|
|
|
);
|
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`.
2024-01-26 14:57:35 +01:00
|
|
|
assert!(actual.err.contains("Directory not found"));
|
Initial implementation of umv from uutils (#10822)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
This closes #10446 , wherein we start implementing `mv` from `uutils`.
There are some stuff to iron out, particularly
* Decide on behavior from ignored tests
* Wait for release/PRs to be approved on `uutils` side, but still can be
tested for now. See [PR
approved](https://github.com/uutils/coreutils/pull/5428), and
[pending](https://github.com/uutils/coreutils/pull/5429).
* `--progress` does not seem to work on `uutils mv` either and have not
checked whether certain `X` size has to be achieved in order for it to
appear, thus something to investigate as well, but thought it wasnt
important enough to not make the PR.
See [issue
comment](https://github.com/nushell/nushell/issues/10446#issuecomment-1764497988),
on the possible strategy to follow, mainly copy what we did with `ucp`.
I still left some comments on purpose particularly on tests, which of
course would be removed before something is decided here. :) @fdncred
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [X] `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
# 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.
-->
2024-01-18 17:20:57 +01:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
#[ignore = "GNU/uutils overwrites rather than error out"]
|
|
|
|
fn error_if_moving_to_existing_file_without_force() {
|
|
|
|
Playground::setup("umv_test_10_0", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![EmptyFile("andres.txt"), EmptyFile("jttxt")]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv andres.txt jttxt"
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains("file already exists"))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn errors_if_destination_doesnt_exist() {
|
|
|
|
Playground::setup("umv_test_10_1", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![EmptyFile("empty.txt")]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv empty.txt does/not/exist/"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(actual.err.contains("failed to access"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
#[ignore = "GNU/uutils doesnt expand, rather cannot stat 'file?.txt'"]
|
|
|
|
fn errors_if_multiple_sources_but_destination_not_a_directory() {
|
|
|
|
Playground::setup("umv_test_10_2", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![
|
|
|
|
EmptyFile("file1.txt"),
|
|
|
|
EmptyFile("file2.txt"),
|
|
|
|
EmptyFile("file3.txt"),
|
|
|
|
]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv file?.txt not_a_dir"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(actual
|
|
|
|
.err
|
|
|
|
.contains("Can only move multiple sources if destination is a directory"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn errors_if_renaming_directory_to_an_existing_file() {
|
|
|
|
Playground::setup("umv_test_10_3", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("mydir")
|
|
|
|
.with_files(vec![EmptyFile("empty.txt")]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv mydir empty.txt"
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains("cannot overwrite non-directory"),);
|
|
|
|
assert!(actual.err.contains("with directory"),);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn errors_if_moving_to_itself() {
|
|
|
|
Playground::setup("umv_test_10_4", |dirs, sandbox| {
|
|
|
|
sandbox.mkdir("mydir").mkdir("mydir/mydir_2");
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv mydir mydir/mydir_2/"
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains("cannot move"));
|
2024-01-30 23:09:43 +01:00
|
|
|
assert!(actual.err.contains("to a subdirectory"));
|
Initial implementation of umv from uutils (#10822)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
This closes #10446 , wherein we start implementing `mv` from `uutils`.
There are some stuff to iron out, particularly
* Decide on behavior from ignored tests
* Wait for release/PRs to be approved on `uutils` side, but still can be
tested for now. See [PR
approved](https://github.com/uutils/coreutils/pull/5428), and
[pending](https://github.com/uutils/coreutils/pull/5429).
* `--progress` does not seem to work on `uutils mv` either and have not
checked whether certain `X` size has to be achieved in order for it to
appear, thus something to investigate as well, but thought it wasnt
important enough to not make the PR.
See [issue
comment](https://github.com/nushell/nushell/issues/10446#issuecomment-1764497988),
on the possible strategy to follow, mainly copy what we did with `ucp`.
I still left some comments on purpose particularly on tests, which of
course would be removed before something is decided here. :) @fdncred
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [X] `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
# 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.
-->
2024-01-18 17:20:57 +01:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn does_not_error_on_relative_parent_path() {
|
|
|
|
Playground::setup("umv_test_11", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("first")
|
|
|
|
.with_files(vec![EmptyFile("first/william_hartnell.txt")]);
|
|
|
|
|
|
|
|
let original = dirs.test().join("first/william_hartnell.txt");
|
|
|
|
let expected = dirs.test().join("william_hartnell.txt");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test().join("first"),
|
|
|
|
"umv william_hartnell.txt ./.."
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(!original.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn move_files_using_glob_two_parents_up_using_multiple_dots() {
|
|
|
|
Playground::setup("umv_test_12", |dirs, sandbox| {
|
|
|
|
sandbox.within("foo").within("bar").with_files(vec![
|
|
|
|
EmptyFile("jtjson"),
|
|
|
|
EmptyFile("andres.xml"),
|
|
|
|
EmptyFile("yehuda.yaml"),
|
|
|
|
EmptyFile("kevin.txt"),
|
|
|
|
EmptyFile("many_more.ppl"),
|
|
|
|
]);
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test().join("foo/bar"),
|
|
|
|
r#"
|
|
|
|
umv * ...
|
|
|
|
"#
|
|
|
|
);
|
|
|
|
|
|
|
|
let files = vec![
|
|
|
|
"yehuda.yaml",
|
|
|
|
"jtjson",
|
|
|
|
"andres.xml",
|
|
|
|
"kevin.txt",
|
|
|
|
"many_more.ppl",
|
|
|
|
];
|
|
|
|
|
|
|
|
let original_dir = dirs.test().join("foo/bar");
|
|
|
|
let destination_dir = dirs.test();
|
|
|
|
|
|
|
|
assert!(files_exist_at(files.clone(), destination_dir));
|
|
|
|
assert!(!files_exist_at(files, original_dir))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn move_file_from_two_parents_up_using_multiple_dots_to_current_dir() {
|
|
|
|
Playground::setup("cp_test_10", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![EmptyFile("hello_there")]);
|
|
|
|
sandbox.within("foo").mkdir("bar");
|
|
|
|
|
|
|
|
nu!(
|
|
|
|
cwd: dirs.test().join("foo/bar"),
|
|
|
|
r#"
|
|
|
|
umv .../hello_there .
|
|
|
|
"#
|
|
|
|
);
|
|
|
|
|
|
|
|
let expected = dirs.test().join("foo/bar/hello_there");
|
|
|
|
let original = dirs.test().join("hello_there");
|
|
|
|
|
|
|
|
assert!(expected.exists());
|
|
|
|
assert!(!original.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn does_not_error_when_some_file_is_moving_into_itself() {
|
|
|
|
Playground::setup("umv_test_13", |dirs, sandbox| {
|
|
|
|
sandbox.mkdir("11").mkdir("12");
|
|
|
|
|
|
|
|
let original_dir = dirs.test().join("11");
|
|
|
|
let expected = dirs.test().join("12/11");
|
|
|
|
nu!(cwd: dirs.test(), "umv 1* 12");
|
|
|
|
|
|
|
|
assert!(!original_dir.exists());
|
|
|
|
assert!(expected.exists());
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn mv_ignores_ansi() {
|
|
|
|
Playground::setup("umv_test_ansi", |_dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![EmptyFile("test.txt")]);
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: sandbox.cwd(),
|
|
|
|
r#"
|
|
|
|
ls | find test | umv $in.0.name success.txt; ls | $in.0.name
|
|
|
|
"#
|
|
|
|
);
|
|
|
|
|
|
|
|
assert_eq!(actual.out, "success.txt");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn mv_directory_with_same_name() {
|
|
|
|
Playground::setup("umv_test_directory_with_same_name", |_dirs, sandbox| {
|
|
|
|
sandbox.mkdir("testdir");
|
|
|
|
sandbox.mkdir("testdir/testdir");
|
|
|
|
|
|
|
|
let cwd = sandbox.cwd().join("testdir");
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: cwd,
|
|
|
|
r#"
|
|
|
|
umv testdir ..
|
|
|
|
"#
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains("Directory not empty"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
// Test that changing the case of a file/directory name works;
|
|
|
|
// this is an important edge case on Windows (and any other case-insensitive file systems).
|
|
|
|
// We were bitten badly by this once: https://github.com/nushell/nushell/issues/6583
|
|
|
|
|
|
|
|
// Currently as we are using `uutils` and have no say in the behavior, this should succeed on Linux,
|
|
|
|
// but fail on both macOS and Windows.
|
|
|
|
fn mv_change_case_of_directory() {
|
|
|
|
Playground::setup("mv_change_case_of_directory", |dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("somedir")
|
|
|
|
.with_files(vec![EmptyFile("somedir/somefile.txt")]);
|
|
|
|
|
|
|
|
let original_dir = String::from("somedir");
|
|
|
|
let new_dir = String::from("SomeDir");
|
|
|
|
|
|
|
|
let _actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
format!("umv {original_dir} {new_dir}")
|
|
|
|
);
|
|
|
|
|
|
|
|
// Doing this instead of `Path::exists()` because we need to check file existence in
|
|
|
|
// a case-sensitive way. `Path::exists()` is understandably case-insensitive on NTFS
|
|
|
|
let _files_in_test_directory: Vec<String> = std::fs::read_dir(dirs.test())
|
|
|
|
.unwrap()
|
|
|
|
.map(|de| de.unwrap().file_name().to_string_lossy().into_owned())
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
#[cfg(target_os = "linux")]
|
|
|
|
assert!(
|
|
|
|
!_files_in_test_directory.contains(&original_dir)
|
|
|
|
&& _files_in_test_directory.contains(&new_dir)
|
|
|
|
);
|
|
|
|
|
|
|
|
#[cfg(target_os = "linux")]
|
|
|
|
assert!(files_exist_at(
|
|
|
|
vec!["somefile.txt",],
|
|
|
|
dirs.test().join(new_dir)
|
|
|
|
));
|
|
|
|
|
|
|
|
#[cfg(not(target_os = "linux"))]
|
|
|
|
_actual.err.contains("to a subdirectory of itself");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
// Currently as we are using `uutils` and have no say in the behavior, this should succeed on Linux,
|
|
|
|
// but fail on both macOS and Windows.
|
|
|
|
fn mv_change_case_of_file() {
|
|
|
|
Playground::setup("mv_change_case_of_file", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![EmptyFile("somefile.txt")]);
|
|
|
|
|
|
|
|
let original_file_name = String::from("somefile.txt");
|
|
|
|
let new_file_name = String::from("SomeFile.txt");
|
|
|
|
|
|
|
|
let _actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
format!("umv {original_file_name} -f {new_file_name}")
|
|
|
|
);
|
|
|
|
|
|
|
|
// Doing this instead of `Path::exists()` because we need to check file existence in
|
|
|
|
// a case-sensitive way. `Path::exists()` is understandably case-insensitive on NTFS
|
|
|
|
let _files_in_test_directory: Vec<String> = std::fs::read_dir(dirs.test())
|
|
|
|
.unwrap()
|
|
|
|
.map(|de| de.unwrap().file_name().to_string_lossy().into_owned())
|
|
|
|
.collect();
|
|
|
|
#[cfg(target_os = "linux")]
|
|
|
|
assert!(
|
|
|
|
!_files_in_test_directory.contains(&original_file_name)
|
|
|
|
&& _files_in_test_directory.contains(&new_file_name)
|
|
|
|
);
|
|
|
|
#[cfg(not(target_os = "linux"))]
|
|
|
|
_actual.err.contains("are the same file");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
#[ignore = "Update not supported..remove later"]
|
|
|
|
fn mv_with_update_flag() {
|
|
|
|
Playground::setup("mv_with_update_flag", |_dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![
|
|
|
|
EmptyFile("valid.txt"),
|
|
|
|
FileWithContent("newer_valid.txt", "body"),
|
|
|
|
]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: sandbox.cwd(),
|
|
|
|
"umv -uf valid.txt newer_valid.txt; open newer_valid.txt",
|
|
|
|
);
|
|
|
|
assert_eq!(actual.out, "body");
|
|
|
|
|
|
|
|
// create a file after assert to make sure that newest_valid.txt is newest
|
|
|
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
|
|
|
sandbox.with_files(vec![FileWithContent("newest_valid.txt", "newest_body")]);
|
|
|
|
let actual = nu!(cwd: sandbox.cwd(), "umv -uf newest_valid.txt valid.txt; open valid.txt");
|
|
|
|
assert_eq!(actual.out, "newest_body");
|
|
|
|
|
|
|
|
// when destination doesn't exist
|
|
|
|
sandbox.with_files(vec![FileWithContent("newest_valid.txt", "newest_body")]);
|
|
|
|
let actual = nu!(cwd: sandbox.cwd(), "umv -uf newest_valid.txt des_missing.txt; open des_missing.txt");
|
|
|
|
assert_eq!(actual.out, "newest_body");
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_mv_no_clobber() {
|
|
|
|
Playground::setup("umv_test_13", |dirs, sandbox| {
|
|
|
|
let file_a = "test_mv_no_clobber_file_a";
|
|
|
|
let file_b = "test_mv_no_clobber_file_b";
|
|
|
|
sandbox.with_files(vec![EmptyFile(file_a)]);
|
|
|
|
sandbox.with_files(vec![EmptyFile(file_b)]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv -n {} {}",
|
|
|
|
file_a,
|
|
|
|
file_b,
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains("not replacing"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn mv_with_no_arguments() {
|
|
|
|
Playground::setup("umv_test_14", |dirs, _| {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv",
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains("Missing file operand"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn mv_with_no_target() {
|
|
|
|
Playground::setup("umv_test_15", |dirs, _| {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
|
|
|
"umv a",
|
|
|
|
);
|
|
|
|
assert!(actual.err.contains(
|
|
|
|
format!(
|
|
|
|
"Missing destination path operand after {}",
|
|
|
|
dirs.test().join("a").display()
|
|
|
|
)
|
|
|
|
.as_str()
|
|
|
|
));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
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`.
2024-01-26 14:57:35 +01:00
|
|
|
#[case("a]c")]
|
|
|
|
#[case("a[c")]
|
|
|
|
#[case("a[bc]d")]
|
|
|
|
#[case("a][c")]
|
Initial implementation of umv from uutils (#10822)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
This closes #10446 , wherein we start implementing `mv` from `uutils`.
There are some stuff to iron out, particularly
* Decide on behavior from ignored tests
* Wait for release/PRs to be approved on `uutils` side, but still can be
tested for now. See [PR
approved](https://github.com/uutils/coreutils/pull/5428), and
[pending](https://github.com/uutils/coreutils/pull/5429).
* `--progress` does not seem to work on `uutils mv` either and have not
checked whether certain `X` size has to be achieved in order for it to
appear, thus something to investigate as well, but thought it wasnt
important enough to not make the PR.
See [issue
comment](https://github.com/nushell/nushell/issues/10446#issuecomment-1764497988),
on the possible strategy to follow, mainly copy what we did with `ucp`.
I still left some comments on purpose particularly on tests, which of
course would be removed before something is decided here. :) @fdncred
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [X] `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
# 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.
-->
2024-01-18 17:20:57 +01:00
|
|
|
fn mv_files_with_glob_metachars(#[case] src_name: &str) {
|
|
|
|
Playground::setup("umv_test_16", |dirs, sandbox| {
|
|
|
|
sandbox.with_files(vec![FileWithContent(
|
|
|
|
src_name,
|
|
|
|
"What is the sound of one hand clapping?",
|
|
|
|
)]);
|
|
|
|
|
|
|
|
let src = dirs.test().join(src_name);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(),
|
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`.
2024-01-26 14:57:35 +01:00
|
|
|
"umv '{}' {}",
|
Initial implementation of umv from uutils (#10822)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
This closes #10446 , wherein we start implementing `mv` from `uutils`.
There are some stuff to iron out, particularly
* Decide on behavior from ignored tests
* Wait for release/PRs to be approved on `uutils` side, but still can be
tested for now. See [PR
approved](https://github.com/uutils/coreutils/pull/5428), and
[pending](https://github.com/uutils/coreutils/pull/5429).
* `--progress` does not seem to work on `uutils mv` either and have not
checked whether certain `X` size has to be achieved in order for it to
appear, thus something to investigate as well, but thought it wasnt
important enough to not make the PR.
See [issue
comment](https://github.com/nushell/nushell/issues/10446#issuecomment-1764497988),
on the possible strategy to follow, mainly copy what we did with `ucp`.
I still left some comments on purpose particularly on tests, which of
course would be removed before something is decided here. :) @fdncred
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [X] `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
# 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.
-->
2024-01-18 17:20:57 +01:00
|
|
|
src.display(),
|
|
|
|
"hello_world_dest"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert!(actual.err.is_empty());
|
|
|
|
assert!(dirs.test().join("hello_world_dest").exists());
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
#[rstest]
|
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`.
2024-01-26 14:57:35 +01:00
|
|
|
#[case("a]?c")]
|
|
|
|
#[case("a*.?c")]
|
Initial implementation of umv from uutils (#10822)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
This closes #10446 , wherein we start implementing `mv` from `uutils`.
There are some stuff to iron out, particularly
* Decide on behavior from ignored tests
* Wait for release/PRs to be approved on `uutils` side, but still can be
tested for now. See [PR
approved](https://github.com/uutils/coreutils/pull/5428), and
[pending](https://github.com/uutils/coreutils/pull/5429).
* `--progress` does not seem to work on `uutils mv` either and have not
checked whether certain `X` size has to be achieved in order for it to
appear, thus something to investigate as well, but thought it wasnt
important enough to not make the PR.
See [issue
comment](https://github.com/nushell/nushell/issues/10446#issuecomment-1764497988),
on the possible strategy to follow, mainly copy what we did with `ucp`.
I still left some comments on purpose particularly on tests, which of
course would be removed before something is decided here. :) @fdncred
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `cargo test --workspace` to check that all tests pass (on Windows
make sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- [X] `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library
<!--
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
# 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.
-->
2024-01-18 17:20:57 +01:00
|
|
|
// windows doesn't allow filename with `*`.
|
|
|
|
fn mv_files_with_glob_metachars_nw(#[case] src_name: &str) {
|
|
|
|
mv_files_with_glob_metachars(src_name);
|
|
|
|
}
|
2024-01-19 12:34:18 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn mv_with_cd() {
|
|
|
|
Playground::setup("umv_test_17", |_dirs, sandbox| {
|
|
|
|
sandbox
|
|
|
|
.mkdir("tmp_dir")
|
|
|
|
.with_files(vec![FileWithContent("tmp_dir/file.txt", "body")]);
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: sandbox.cwd(),
|
|
|
|
r#"do { cd tmp_dir; let f = 'file.txt'; umv $f .. }; open file.txt"#,
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("body"));
|
|
|
|
});
|
|
|
|
}
|
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`.
2024-01-26 14:57:35 +01:00
|
|
|
|
|
|
|
#[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()));
|
|
|
|
});
|
|
|
|
}
|