glob with ../ prefix now works;

[bobhy]

Fixes #10503
Also improves link to metacharacter help;

Description

glob code was using pattern as provided by user. If that had leading ..\, wax::Glob is documented to treat them as literal chars to be matched.
Fix is to use wax::Glob.partition() to split such invariant prefixes off the pattern and tack them onto the working directory computed separately.

Before

> ls ..
╭───┬───────┬──────┬──────┬───────────────╮
│ # │ name  │ type │ size │   modified    │
├───┼───────┼──────┼──────┼───────────────┤
│ 0 │ ../r1 │ dir  │  7 B │ 3 hours ago   │
│ 1 │ ../r2 │ dir  │  3 B │ a day ago     │
│ 2 │ ../r3 │ dir  │ 13 B │ 4 minutes ago │
╰───┴───────┴──────┴──────┴───────────────╯
> glob ../r*
╭────────────╮
│ empty list │
╰────────────╯

After

> glob ../r*
╭───┬──────────────────────────────╮
│ 0 │ /home/bobhy/src/rust/work/r2 │
│ 1 │ /home/bobhy/src/rust/work/r1 │
│ 2 │ /home/bobhy/src/rust/work/r3 │
╰───┴──────────────────────────────╯

User-Facing Changes

None

Tests + Formatting

• 🟢 toolkit fmt
• 🟢 toolkit clippy
• 🟢 toolkit test
• 🟢 toolkit test stdlib

After Submitting

[fdncred]

While I agree with this sentiment, we'll have to do something different because it doesn't work right in Windows due to verbatim paths that canonicalize returns. I believe this is the reason dunce is used in there example. Not sure dunce is still supported or if we use it, but I think omnipath supports such things too.

❯ glob **/*.{rs,toml} --depth 2
╭──┬──────────────────────────────────────────────────────────────────────╮
│ 0│\\?\C:\Users\username\source\repos\forks\nushell\.cargo\config.toml   │
│ 1│\\?\C:\Users\username\source\repos\forks\nushell\.github\.typos.toml  │
│ 2│\\?\C:\Users\username\source\repos\forks\nushell\benches\benchmarks.rs│
│ 3│\\?\C:\Users\username\source\repos\forks\nushell\Cargo.toml           │
│ 4│\\?\C:\Users\username\source\repos\forks\nushell\Cross.toml           │
│ 5│\\?\C:\Users\username\source\repos\forks\nushell\rust-toolchain.toml  │
│ 6│\\?\C:\Users\username\source\repos\forks\nushell\scripts\build.rs     │
│ 7│\\?\C:\Users\username\source\repos\forks\nushell\src\command.rs       │
│ 8│\\?\C:\Users\username\source\repos\forks\nushell\src\config_files.rs  │
│ 9│\\?\C:\Users\username\source\repos\forks\nushell\src\ide.rs           │
│10│\\?\C:\Users\username\source\repos\forks\nushell\src\logger.rs        │
│11│\\?\C:\Users\username\source\repos\forks\nushell\src\main.rs          │
│12│\\?\C:\Users\username\source\repos\forks\nushell\src\run.rs           │
│13│\\?\C:\Users\username\source\repos\forks\nushell\src\signals.rs       │
│14│\\?\C:\Users\username\source\repos\forks\nushell\src\terminal.rs      │
│15│\\?\C:\Users\username\source\repos\forks\nushell\src\tests.rs         │
│16│\\?\C:\Users\username\source\repos\forks\nushell\src\test_bins.rs     │
│17│\\?\C:\Users\username\source\repos\forks\nushell\tests\main.rs        │
╰──┴──────────────────────────────────────────────────────────────────────╯

[bobhy]

Whew! Ready for review!

[fdncred]

wow, that was a hard-fought battle. ⚔️

[fdncred]

Looks much better on Windows

╭──┬──────────────────────────────────────────────────────────────────────╮
│ 0│C:\Users\username\source\repos\forks.bak\nushell\.cargo\config.toml   │
│ 1│C:\Users\username\source\repos\forks.bak\nushell\.github\.typos.toml  │
│ 2│C:\Users\username\source\repos\forks.bak\nushell\benches\benchmarks.rs│
│ 3│C:\Users\username\source\repos\forks.bak\nushell\Cargo.toml           │
│ 4│C:\Users\username\source\repos\forks.bak\nushell\Cross.toml           │
│ 5│C:\Users\username\source\repos\forks.bak\nushell\rust-toolchain.toml  │
│ 6│C:\Users\username\source\repos\forks.bak\nushell\scripts\build.rs     │
│ 7│C:\Users\username\source\repos\forks.bak\nushell\src\command.rs       │
│ 8│C:\Users\username\source\repos\forks.bak\nushell\src\config_files.rs  │
│ 9│C:\Users\username\source\repos\forks.bak\nushell\src\ide.rs           │
│10│C:\Users\username\source\repos\forks.bak\nushell\src\logger.rs        │
│11│C:\Users\username\source\repos\forks.bak\nushell\src\main.rs          │
│12│C:\Users\username\source\repos\forks.bak\nushell\src\run.rs           │
│13│C:\Users\username\source\repos\forks.bak\nushell\src\signals.rs       │
│14│C:\Users\username\source\repos\forks.bak\nushell\src\terminal.rs      │
│15│C:\Users\username\source\repos\forks.bak\nushell\src\tests.rs         │
│16│C:\Users\username\source\repos\forks.bak\nushell\src\test_bins.rs     │
│17│C:\Users\username\source\repos\forks.bak\nushell\tests\main.rs        │
╰──┴──────────────────────────────────────────────────────────────────────╯

[fdncred]

Glad to see you finally got this working. I just removed some comments but I think it's ready too.

[bobhy]

https://docs.rs/wax/0.5.0 doesn't include doc for the metachars, it links to the repo page abov?. I think our link should go to a page that has this information in it (somewhere)?

…

On Thu, Sep 28, 2023 at 7:23 AM Jakub Žádník ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In crates/nu-command/src/filesystem/glob.rs <#10504 (comment)>: > @@ -123,7 +123,7 @@ impl Command for Glob { } fn extra_usage(&self) -> &str { - r#"For more glob pattern help, please refer to https://github.com/olson-sean-k/wax"# + r#"For more glob pattern help, please refer to https://github.com/olson-sean-k/wax/blob/master/README.md#patterns"# @bobhy <https://github.com/bobhy> Could you still use the shorter docs.rs link? — Reply to this email directly, view it on GitHub <#10504 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAPBIZFKCJLO2WWGGR3T2Z3X4WB4PANCNFSM6AAAAAA5HGXAAA> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[kubouch]

Ah yeah, wrong link. You could point at https://crates.io/crates/wax, for example (or maybe https://docs.rs/crate/wax) to show the README immediately. Not a big deal, though, I just thought the link was too long for a help message and the # reference might be prone to change.

[fdncred]

My changes were reverted by force pushes. So, I made the changes again to change the link and remove some excess comments. We can land this when it's green again.