refactor(args): move one_file_system between deduplicate_hardlinks and top_down

https://claude.ai/code/session_01LfpnUZrgq93MVZgA3KVqE6

Author: claude

USAGE.md

@@ -39,6 +39,13 @@ How to display the numbers of bytes.
 
 Detect and subtract the sizes of hardlinks from their parent directory totals.
 
+<a id="option-x" name="option-x"></a><a id="one-file-system" name="one-file-system"></a>
+### `--one-file-system`
+
+* _Aliases:_ `-x`.
+
+Skip directories on different filesystems.
+
 <a id="top-down" name="top-down"></a>
 ### `--top-down`
 
@@ -101,13 +108,6 @@ Do not sort the branches in the tree.
 
 Prevent filesystem error messages from appearing in stderr.
 
-<a id="option-x" name="option-x"></a><a id="one-file-system" name="one-file-system"></a>
-### `--one-file-system`
-
-* _Aliases:_ `-x`.
-
-Skip directories on different filesystems.
-
 <a id="option-p" name="option-p"></a><a id="progress" name="progress"></a>
 ### `--progress`
 

exports/completion.bash

@@ -23,7 +23,7 @@ _pdu() {
 
     case "${cmd}" in
         pdu)
-            opts="-b -H -q -d -w -m -s -x -p -h -V --json-input --json-output --bytes-format --detect-links --dedupe-links --deduplicate-hardlinks --top-down --align-right --quantity --depth --max-depth --width --total-width --column-width --min-ratio --no-sort --no-errors --silent-errors --one-file-system --progress --threads --omit-json-shared-details --omit-json-shared-summary --help --version [FILES]..."
+            opts="-b -H -x -q -d -w -m -s -p -h -V --json-input --json-output --bytes-format --detect-links --dedupe-links --deduplicate-hardlinks --one-file-system --top-down --align-right --quantity --depth --max-depth --width --total-width --column-width --min-ratio --no-sort --no-errors --silent-errors --progress --threads --omit-json-shared-details --omit-json-shared-summary --help --version [FILES]..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0

exports/completion.elv

@@ -38,14 +38,14 @@ set edit:completion:arg-completer[pdu] = {|@words|
             cand --deduplicate-hardlinks 'Detect and subtract the sizes of hardlinks from their parent directory totals'
             cand --detect-links 'Detect and subtract the sizes of hardlinks from their parent directory totals'
             cand --dedupe-links 'Detect and subtract the sizes of hardlinks from their parent directory totals'
+            cand -x 'Skip directories on different filesystems'
+            cand --one-file-system 'Skip directories on different filesystems'
             cand --top-down 'Print the tree top-down instead of bottom-up'
             cand --align-right 'Set the root of the bars to the right'
             cand --no-sort 'Do not sort the branches in the tree'
             cand -s 'Prevent filesystem error messages from appearing in stderr'
             cand --silent-errors 'Prevent filesystem error messages from appearing in stderr'
             cand --no-errors 'Prevent filesystem error messages from appearing in stderr'
-            cand -x 'Skip directories on different filesystems'
-            cand --one-file-system 'Skip directories on different filesystems'
             cand -p 'Report progress being made at the expense of performance'
             cand --progress 'Report progress being made at the expense of performance'
             cand --omit-json-shared-details 'Do not output `.shared.details` in the JSON output'

exports/completion.fish

@@ -12,11 +12,11 @@ complete -c pdu -l threads -d 'Set the maximum number of threads to spawn. Could
 complete -c pdu -l json-input -d 'Read JSON data from stdin'
 complete -c pdu -l json-output -d 'Print JSON data instead of an ASCII chart'
 complete -c pdu -s H -l deduplicate-hardlinks -l detect-links -l dedupe-links -d 'Detect and subtract the sizes of hardlinks from their parent directory totals'
+complete -c pdu -s x -l one-file-system -d 'Skip directories on different filesystems'
 complete -c pdu -l top-down -d 'Print the tree top-down instead of bottom-up'
 complete -c pdu -l align-right -d 'Set the root of the bars to the right'
 complete -c pdu -l no-sort -d 'Do not sort the branches in the tree'
 complete -c pdu -s s -l silent-errors -l no-errors -d 'Prevent filesystem error messages from appearing in stderr'
-complete -c pdu -s x -l one-file-system -d 'Skip directories on different filesystems'
 complete -c pdu -s p -l progress -d 'Report progress being made at the expense of performance'
 complete -c pdu -l omit-json-shared-details -d 'Do not output `.shared.details` in the JSON output'
 complete -c pdu -l omit-json-shared-summary -d 'Do not output `.shared.summary` in the JSON output'

exports/completion.ps1

@@ -41,14 +41,14 @@ Register-ArgumentCompleter -Native -CommandName 'pdu' -ScriptBlock {
             [CompletionResult]::new('--deduplicate-hardlinks', '--deduplicate-hardlinks', [CompletionResultType]::ParameterName, 'Detect and subtract the sizes of hardlinks from their parent directory totals')
             [CompletionResult]::new('--detect-links', '--detect-links', [CompletionResultType]::ParameterName, 'Detect and subtract the sizes of hardlinks from their parent directory totals')
             [CompletionResult]::new('--dedupe-links', '--dedupe-links', [CompletionResultType]::ParameterName, 'Detect and subtract the sizes of hardlinks from their parent directory totals')
+            [CompletionResult]::new('-x', '-x', [CompletionResultType]::ParameterName, 'Skip directories on different filesystems')
+            [CompletionResult]::new('--one-file-system', '--one-file-system', [CompletionResultType]::ParameterName, 'Skip directories on different filesystems')
             [CompletionResult]::new('--top-down', '--top-down', [CompletionResultType]::ParameterName, 'Print the tree top-down instead of bottom-up')
             [CompletionResult]::new('--align-right', '--align-right', [CompletionResultType]::ParameterName, 'Set the root of the bars to the right')
             [CompletionResult]::new('--no-sort', '--no-sort', [CompletionResultType]::ParameterName, 'Do not sort the branches in the tree')
             [CompletionResult]::new('-s', '-s', [CompletionResultType]::ParameterName, 'Prevent filesystem error messages from appearing in stderr')
             [CompletionResult]::new('--silent-errors', '--silent-errors', [CompletionResultType]::ParameterName, 'Prevent filesystem error messages from appearing in stderr')
             [CompletionResult]::new('--no-errors', '--no-errors', [CompletionResultType]::ParameterName, 'Prevent filesystem error messages from appearing in stderr')
-            [CompletionResult]::new('-x', '-x', [CompletionResultType]::ParameterName, 'Skip directories on different filesystems')
-            [CompletionResult]::new('--one-file-system', '--one-file-system', [CompletionResultType]::ParameterName, 'Skip directories on different filesystems')
             [CompletionResult]::new('-p', '-p', [CompletionResultType]::ParameterName, 'Report progress being made at the expense of performance')
             [CompletionResult]::new('--progress', '--progress', [CompletionResultType]::ParameterName, 'Report progress being made at the expense of performance')
             [CompletionResult]::new('--omit-json-shared-details', '--omit-json-shared-details', [CompletionResultType]::ParameterName, 'Do not output `.shared.details` in the JSON output')

exports/completion.zsh

@@ -43,14 +43,14 @@ block-count\:"Count numbers of blocks"))' \
 '--deduplicate-hardlinks[Detect and subtract the sizes of hardlinks from their parent directory totals]' \
 '--detect-links[Detect and subtract the sizes of hardlinks from their parent directory totals]' \
 '--dedupe-links[Detect and subtract the sizes of hardlinks from their parent directory totals]' \
+'-x[Skip directories on different filesystems]' \
+'--one-file-system[Skip directories on different filesystems]' \
 '--top-down[Print the tree top-down instead of bottom-up]' \
 '--align-right[Set the root of the bars to the right]' \
 '--no-sort[Do not sort the branches in the tree]' \
 '-s[Prevent filesystem error messages from appearing in stderr]' \
 '--silent-errors[Prevent filesystem error messages from appearing in stderr]' \
 '--no-errors[Prevent filesystem error messages from appearing in stderr]' \
-'-x[Skip directories on different filesystems]' \
-'--one-file-system[Skip directories on different filesystems]' \
 '-p[Report progress being made at the expense of performance]' \
 '--progress[Report progress being made at the expense of performance]' \
 '--omit-json-shared-details[Do not output \`.shared.details\` in the JSON output]' \

exports/long.help

@@ -31,6 +31,9 @@ Options:
 
           [aliases: --detect-links, --dedupe-links]
 
+  -x, --one-file-system
+          Skip directories on different filesystems
+
       --top-down
           Print the tree top-down instead of bottom-up
 
@@ -74,9 +77,6 @@ Options:
 
           [aliases: --no-errors]
 
-  -x, --one-file-system
-          Skip directories on different filesystems
-
   -p, --progress
           Report progress being made at the expense of performance
 

exports/short.help

@@ -14,6 +14,8 @@ Options:
           How to display the numbers of bytes [default: metric] [possible values: plain, metric, binary]
   -H, --deduplicate-hardlinks
           Detect and subtract the sizes of hardlinks from their parent directory totals [aliases: --detect-links, --dedupe-links]
+  -x, --one-file-system
+          Skip directories on different filesystems
       --top-down
           Print the tree top-down instead of bottom-up
       --align-right
@@ -32,8 +34,6 @@ Options:
           Do not sort the branches in the tree
   -s, --silent-errors
           Prevent filesystem error messages from appearing in stderr [aliases: --no-errors]
-  -x, --one-file-system
-          Skip directories on different filesystems
   -p, --progress
           Report progress being made at the expense of performance
       --threads <THREADS>

src/app.rs

@@ -291,6 +291,7 @@ impl App {
                     progress: $progress,
                     #[cfg(unix)] deduplicate_hardlinks: $hardlinks,
                     #[cfg(not(unix))] deduplicate_hardlinks: _,
+                    one_file_system,
                     files,
                     json_output,
                     bytes_format,
@@ -299,7 +300,6 @@ impl App {
                     max_depth,
                     min_ratio,
                     no_sort,
-                    one_file_system,
                     omit_json_shared_details,
                     omit_json_shared_summary,
                     ..

src/args.rs

@@ -112,6 +112,11 @@ pub struct Args {
     #[cfg_attr(not(unix), clap(hide = true))]
     pub deduplicate_hardlinks: bool,
 
+    /// Skip directories on different filesystems.
+    #[clap(long, short = 'x')]
+    #[cfg_attr(not(unix), clap(hide = true))]
+    pub one_file_system: bool,
+
     /// Print the tree top-down instead of bottom-up.
     #[clap(long)]
     pub top_down: bool,
@@ -155,11 +160,6 @@ pub struct Args {
     #[clap(long, short, visible_alias = "no-errors")]
     pub silent_errors: bool,
 
-    /// Skip directories on different filesystems.
-    #[clap(long, short = 'x')]
-    #[cfg_attr(not(unix), clap(hide = true))]
-    pub one_file_system: bool,
-
     /// Report progress being made at the expense of performance.
     #[clap(long, short)]
     pub progress: bool,