chore(git): merge from master

Author: KSXGitHub

exports/completion.elv

@@ -29,12 +29,12 @@ set edit:completion:arg-completer[pdu] = {|@words|
             cand --threads 'Set the maximum number of threads to spawn. Could be either "auto", "max", or a number'
             cand --json-input 'Read JSON data from stdin'
             cand --json-output 'Print JSON data instead of an ASCII chart'
-            cand --deduplicate-hardlinks 'Detect duplicated hardlinks and remove their sizes from total'
-            cand --detect-links 'Detect duplicated hardlinks and remove their sizes from total'
-            cand --dedupe-links 'Detect duplicated hardlinks and remove their sizes from total'
+            cand --deduplicate-hardlinks 'Detect duplicated hardlinks and subtract their sizes from total'
+            cand --detect-links 'Detect duplicated hardlinks and subtract their sizes from total'
+            cand --dedupe-links 'Detect duplicated hardlinks and subtract their sizes from total'
             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 'Preserve order of entries'
+            cand --no-sort 'Do not sort the branches in the tree'
             cand --silent-errors 'Prevent filesystem error messages from appearing in stderr'
             cand --no-errors 'Prevent filesystem error messages from appearing in stderr'
             cand --progress 'Report progress being made at the expense of performance'

exports/completion.fish

@@ -11,10 +11,10 @@ complete -c pdu -l min-ratio -d 'Minimal size proportion required to appear' -r
 complete -c pdu -l threads -d 'Set the maximum number of threads to spawn. Could be either "auto", "max", or a number' -r
 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 -l deduplicate-hardlinks -l detect-links -l dedupe-links -d 'Detect duplicated hardlinks and remove their sizes from total'
+complete -c pdu -l deduplicate-hardlinks -l detect-links -l dedupe-links -d 'Detect duplicated hardlinks and subtract their sizes from total'
 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 'Preserve order of entries'
+complete -c pdu -l no-sort -d 'Do not sort the branches in the tree'
 complete -c pdu -l silent-errors -l no-errors -d 'Prevent filesystem error messages from appearing in stderr'
 complete -c pdu -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'

exports/completion.ps1

@@ -32,12 +32,12 @@ Register-ArgumentCompleter -Native -CommandName 'pdu' -ScriptBlock {
             [CompletionResult]::new('--threads', '--threads', [CompletionResultType]::ParameterName, 'Set the maximum number of threads to spawn. Could be either "auto", "max", or a number')
             [CompletionResult]::new('--json-input', '--json-input', [CompletionResultType]::ParameterName, 'Read JSON data from stdin')
             [CompletionResult]::new('--json-output', '--json-output', [CompletionResultType]::ParameterName, 'Print JSON data instead of an ASCII chart')
-            [CompletionResult]::new('--deduplicate-hardlinks', '--deduplicate-hardlinks', [CompletionResultType]::ParameterName, 'Detect duplicated hardlinks and remove their sizes from total')
-            [CompletionResult]::new('--detect-links', '--detect-links', [CompletionResultType]::ParameterName, 'Detect duplicated hardlinks and remove their sizes from total')
-            [CompletionResult]::new('--dedupe-links', '--dedupe-links', [CompletionResultType]::ParameterName, 'Detect duplicated hardlinks and remove their sizes from total')
+            [CompletionResult]::new('--deduplicate-hardlinks', '--deduplicate-hardlinks', [CompletionResultType]::ParameterName, 'Detect duplicated hardlinks and subtract their sizes from total')
+            [CompletionResult]::new('--detect-links', '--detect-links', [CompletionResultType]::ParameterName, 'Detect duplicated hardlinks and subtract their sizes from total')
+            [CompletionResult]::new('--dedupe-links', '--dedupe-links', [CompletionResultType]::ParameterName, 'Detect duplicated hardlinks and subtract their sizes from total')
             [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, 'Preserve order of entries')
+            [CompletionResult]::new('--no-sort', '--no-sort', [CompletionResultType]::ParameterName, 'Do not sort the branches in the tree')
             [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('--progress', '--progress', [CompletionResultType]::ParameterName, 'Report progress being made at the expense of performance')

exports/completion.zsh

@@ -30,12 +30,12 @@ block-count\:"Count numbers of blocks"))' \
 '--threads=[Set the maximum number of threads to spawn. Could be either "auto", "max", or a number]:THREADS:_default' \
 '(--quantity --deduplicate-hardlinks)--json-input[Read JSON data from stdin]' \
 '--json-output[Print JSON data instead of an ASCII chart]' \
-'--deduplicate-hardlinks[Detect duplicated hardlinks and remove their sizes from total]' \
-'--detect-links[Detect duplicated hardlinks and remove their sizes from total]' \
-'--dedupe-links[Detect duplicated hardlinks and remove their sizes from total]' \
+'--deduplicate-hardlinks[Detect duplicated hardlinks and subtract their sizes from total]' \
+'--detect-links[Detect duplicated hardlinks and subtract their sizes from total]' \
+'--dedupe-links[Detect duplicated hardlinks and subtract their sizes from total]' \
 '--top-down[Print the tree top-down instead of bottom-up]' \
 '--align-right[Set the root of the bars to the right]' \
-'--no-sort[Preserve order of entries]' \
+'--no-sort[Do not sort the branches in the tree]' \
 '--silent-errors[Prevent filesystem error messages from appearing in stderr]' \
 '--no-errors[Prevent filesystem error messages from appearing in stderr]' \
 '--progress[Report progress being made at the expense of performance]' \

src/args.rs

@@ -138,7 +138,7 @@ pub struct Args {
     #[clap(long, default_value = "0.01")]
     pub min_ratio: Fraction,
 
-    /// Preserve order of entries.
+    /// Do not sort the branches in the tree.
     #[clap(long)]
     pub no_sort: bool,