Merge branch 'main' into ci/riscv64-release

Author: gounthar

README.md

@@ -110,7 +110,7 @@ eza’s options are almost, but not quite, entirely unlike `ls`’s. Quick overv
 - **--colo[u]r-scale=(field)**: highlight levels of `field` distinctly(all, age, size)
 - **--color-scale-mode=(mode)**: use gradient or fixed colors in --color-scale. valid options are `fixed` or `gradient`
 - **--icons=(when)**: when to display icons (always, auto, never)
-- **--hyperlink**: display entries as hyperlinks
+- **--hyperlink=(when)**: when to display entries as hyperlinks (always, auto, never)
 - **--absolute=(mode)**: display entries with their absolute path (on, follow, off)
 - **-w**, **--width=(columns)**: set screen width in columns
 

completions/bash/eza

@@ -18,6 +18,11 @@ _eza() {
             return
             ;;
 
+        --hyperlink)
+            mapfile -t COMPREPLY < <(compgen -W 'always automatic auto never' -- "$cur")
+            return
+            ;;
+
         -L|--level)
             mapfile -t COMPREPLY < <(compgen -W '{0..9}' -- "$cur")
             return

completions/fish/eza.fish

@@ -37,7 +37,12 @@ complete -c eza -l icons -d "When to display icons" -x -a "
   never\t'Never display icons'
 "
 complete -c eza -l no-quotes -d "Don't quote file names with spaces"
-complete -c eza -l hyperlink -d "Display entries as hyperlinks"
+complete -c eza -l hyperlink -d "When to display entries as hyperlinks" -x -a "
+  always\t'Always display entries as hyperlinks'
+  auto\t'Display hyperlinks if standard output is a terminal'
+  automatic\t'Display hyperlinks if standard output is a terminal'
+  never\t'Never display entries as hyperlinks'
+"
 complete -c eza -l follow-symlinks -d "Drill down into symbolic links that point to directories"
 complete -c eza -l absolute -d "Display entries with their absolute path" -x -a "
   on\t'Show absolute path for listed entries'

completions/nush/eza.nu

@@ -17,7 +17,7 @@ export extern "eza" [
     --colour-scale-mode        # Use gradient or fixed colors in --colour-scale
     --icons                    # When to display icons
     --no-quotes                # Don't quote file names with spaces
-    --hyperlink                # Display entries as hyperlinks
+    --hyperlink                # When to display entries as hyperlinks
     --absolute                 # Display entries with their absolute path
     --follow-symlinks          # Drill down into symbolic links that point to directories
     --group-directories-first  # Sort directories before other files

completions/pwsh/_eza.ps1

@@ -77,6 +77,11 @@ Register-ArgumentCompleter -Native -CommandName 'eza' -ScriptBlock {
             ForEach-Object {[System.Management.Automation.CompletionResult]::new($_, $_, "ParameterValue", $_)}
             break
         }
+        '*;--hyperlink' {
+            $ArrayWhen | 
+            ForEach-Object {[System.Management.Automation.CompletionResult]::new($_, $_, "ParameterValue", $_)}
+            break
+        }
         '*;--all' {
             [CompletionResult]::new('--show-symlinks'            ,'listfilessyl'        , [CompletionResultType]::ParameterName, 'explicitly show symbolic links (for use with --only-dirs | --only-files)')
             [CompletionResult]::new('--no-symlinks'              ,'listfilessyl'        , [CompletionResultType]::ParameterName, 'do not show symbolic links')
@@ -158,7 +163,7 @@ Register-ArgumentCompleter -Native -CommandName 'eza' -ScriptBlock {
         #   [CompletionResult]::new('--colour-scale-mode'        ,'colorscalemode'      , [CompletionResultType]::ParameterName, 'use gradient or fixed colors in --color-scale (fixed, gradient)')
             [CompletionResult]::new('--icons'                    ,'icons'               , [CompletionResultType]::ParameterName, 'when to display icons (always, auto, never)')
             [CompletionResult]::new('--no-quotes'                ,'noquotes'            , [CompletionResultType]::ParameterName, 'don''t quote file names with spaces')
-            [CompletionResult]::new('--hyperlink'                ,'hyperlink'           , [CompletionResultType]::ParameterName, 'display entries as hyperlinks')
+            [CompletionResult]::new('--hyperlink'                ,'hyperlink'           , [CompletionResultType]::ParameterName, 'when to display entries as hyperlinks (always, auto, never)')
             [CompletionResult]::new('--absolute'                 ,'absolute'            , [CompletionResultType]::ParameterName, 'display entries with their absolute path (on, follow, off)')
             [CompletionResult]::new('--follow-symlinks'          ,'followsymlinks'      , [CompletionResultType]::ParameterName, 'drill down into symbolic links that point to directories')
         #   [CompletionResult]::new('-w'                         ,'widths'              , [CompletionResultType]::ParameterName, 'set screen width in columns')

completions/zsh/_eza

@@ -25,7 +25,7 @@ __eza() {
         --colo{,u}r-scale-mode"[Use gradient or fixed colors in --color-scale]:(mode):(fixed gradient)" \
         --icons="[When to display icons]:(when):(always auto automatic never)" \
         --no-quotes"[Don't quote filenames with spaces]" \
-        --hyperlink"[Display entries as hyperlinks]" \
+        --hyperlink="[When to display entries as hyperlinks]:(when):(always auto automatic never)" \
         --absolute"[Display entries with their absolute path]:(mode):(on follow off)" \
         --follow-symlinks"[Drill down into symbolic links that point to directories]" \
         --group-directories-first"[Sort directories before other files]" \

man/eza.1.md

@@ -123,9 +123,14 @@ When used without a value, defaults to ‘`automatic`’.
 `--no-quotes`
 : Don't quote file names with spaces.
 
-`--hyperlink`
+`--hyperlink=WHEN`
 : Display entries as hyperlinks
 
+Valid settings are ‘`always`’, ‘`automatic`’ (‘`auto`’ for short), and ‘`never`’.
+When used without a value, defaults to ‘`automatic`’.
+
+`automatic` or `auto` will display hyperlinks only when the standard output is connected to a real terminal. If `eza` is ran while in a `tty`, or the output of `eza` is either redirected to a file or piped into another program, hyperlinks will not be used. Setting this option to ‘`always`’ causes `eza` to always display hyperlinks, while ‘`never`’ disables the use of hyperlinks.
+
 `-w`, `--width=COLS`
 : Set screen width in columns.
 

nix/trycmd.nix

@@ -21,7 +21,14 @@
       bash devtools/dir-generator.sh tests/test_dir && echo "Dir generated"
       bash devtools/generate-timestamp-test-dir.sh tests/timestamp_test_dir
     '';
-    cargoTestOptions = opts: opts ++ [ "--features nix" ];
+    cargoTestOptions =
+      opts:
+      opts
+      ++ [
+        "--features nix"
+        "--features nix-local"
+        "--features powertest"
+      ];
     inherit buildInputs;
     nativeBuildInputs = with pkgs; [ git ];
   };

powertest.yaml

@@ -69,6 +69,12 @@ commands:
   ? - null
     - --hyperlink
   :
+  ? - null
+    - --hyperlink
+  : values:
+      - auto
+      - always
+      - never
   ? - null
     - --absolute
   : values:
@@ -114,27 +120,27 @@ commands:
   : short: -s
     long: time-style
     prefix: -l
-    values:
-      #- accessed
-      - age
-      #- changed
-      #- created
-      - date
+    values: # non-deterministic results with our setup (tests/test_dir) are commented out 
+      # - accessed
+      # - age
+      # - changed
+      # - created
+      # - date
       - Ext
       - ext
       - Extension
       - extension
       - Filename
       - filename
-      - inode
-      - modified
+      # - inode
+      # - modified
       - Name
       - name
-      - newest
-      #- none seems non-deterministic
-      - oldest
-      - size
-      - time
+      # - newest
+      # - none
+      # - oldest
+      # - size
+      # - time
       - type
   ? - null
     - --group-directories-first

src/options/file_name.rs

@@ -95,10 +95,10 @@ impl QuoteStyle {
 
 impl EmbedHyperlinks {
     fn deduce(matches: &ArgMatches) -> Self {
-        if matches.get_flag("hyperlink") {
-            Self::On
-        } else {
-            Self::Off
+        match matches.get_one("hyperlink") {
+            Some(ShowWhen::Never) | None => Self::Never,
+            Some(ShowWhen::Always) => Self::Always,
+            Some(ShowWhen::Auto) => Self::Automatic,
         }
     }
 }
@@ -149,18 +149,34 @@ mod tests {
     }
 
     #[test]
-    fn deduce_embed_hyperlinks_on() {
+    fn deduce_embed_hyperlinks_auto() {
         assert_eq!(
             EmbedHyperlinks::deduce(&mock_cli(vec!["--hyperlink"])),
-            EmbedHyperlinks::On
+            EmbedHyperlinks::Automatic
+        );
+        assert_eq!(
+            EmbedHyperlinks::deduce(&mock_cli(vec!["--hyperlink", "auto"])),
+            EmbedHyperlinks::Automatic
+        );
+    }
+
+    #[test]
+    fn deduce_embed_hyperlinks_always() {
+        assert_eq!(
+            EmbedHyperlinks::deduce(&mock_cli(vec!["--hyperlink", "always"])),
+            EmbedHyperlinks::Always
         );
     }
 
     #[test]
-    fn deduce_embed_hyperlinks_off() {
+    fn deduce_embed_hyperlinks_never() {
+        assert_eq!(
+            EmbedHyperlinks::deduce(&mock_cli(vec!["--hyperlink", "never"])),
+            EmbedHyperlinks::Never
+        );
         assert_eq!(
             EmbedHyperlinks::deduce(&mock_cli(vec![""])),
-            EmbedHyperlinks::Off
+            EmbedHyperlinks::Never
         );
     }
 
@@ -254,7 +270,7 @@ mod tests {
                 classify: Classify::JustFilenames,
                 show_icons: ShowIcons::Never,
                 quote_style: QuoteStyle::QuoteSpaces,
-                embed_hyperlinks: EmbedHyperlinks::Off,
+                embed_hyperlinks: EmbedHyperlinks::Never,
                 absolute: Absolute::Off,
                 is_a_tty: true,
             })