Skip to content

du: Allow command-line argument that appears more than once #11897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 16 commits into from
Apr 20, 2026
+261 −21
Merged

du: Allow command-line argument that appears more than once #11897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
23db218
du: Allow command-line argument that appears more than once
vogonsoft Apr 19, 2026
8969efc
du: Undid a mistake modification
vogonsoft Apr 19, 2026
76c0269
du: added unit tests for repeating command-line arguments
vogonsoft Apr 19, 2026
917f21f
Fix: cargo fmt
vogonsoft Apr 19, 2026
849a403
du: small fixes to make unit test pass
vogonsoft Apr 20, 2026
9c95d70
du: fixed formatting
vogonsoft Apr 20, 2026
e8204b2
du: changes to make clippy happy
vogonsoft Apr 20, 2026
8993d05
du: changes to make clippy happy
vogonsoft Apr 20, 2026
fdc9522
du: fixed tests to make them pass on all OSs
vogonsoft Apr 20, 2026
3c2f816
du: fixed formatting
vogonsoft Apr 20, 2026
f9464ca
du: fixed tests so they would pass on all OSs
vogonsoft Apr 20, 2026
91473ad
du: address PR comments
vogonsoft Apr 20, 2026
5486e8b
Merged with main
vogonsoft Apr 20, 2026
4d6d7f0
du: added code that enables -a to be used multiple times
vogonsoft Apr 20, 2026
fc26b79
du: fixed formatting
vogonsoft Apr 20, 2026
d21d3b6
du: fixed formatting
vogonsoft Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 44 additions & 21 deletions src/uu/du/src/du.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,131 +1289,150 @@ pub fn uu_app() -> Command {
.long(options::ALL)
.help(translate!("du-help-all"))
.conflicts_with(options::SUMMARIZE)
.overrides_with(options::ALL)
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::APPARENT_SIZE)
.short('A')
.long(options::APPARENT_SIZE)
.help(translate!("du-help-apparent-size"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::APPARENT_SIZE),
)
.arg(
Arg::new(options::BLOCK_SIZE)
.short('B')
.long(options::BLOCK_SIZE)
.value_name("SIZE")
.help(translate!("du-help-block-size")),
.help(translate!("du-help-block-size"))
.overrides_with(options::BLOCK_SIZE),
)
.arg(
Arg::new(options::BYTES)
.short('b')
.long("bytes")
.help(translate!("du-help-bytes"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::BYTES),
)
.arg(
Arg::new(options::TOTAL)
.long("total")
.short('c')
.help(translate!("du-help-total"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::TOTAL),
)
.arg(
Arg::new(options::MAX_DEPTH)
.short('d')
.long("max-depth")
.value_name("N")
.help(translate!("du-help-max-depth")),
.help(translate!("du-help-max-depth"))
.overrides_with(options::MAX_DEPTH),
)
.arg(
Arg::new(options::HUMAN_READABLE)
.long("human-readable")
.short('h')
.help(translate!("du-help-human-readable"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::HUMAN_READABLE),
)
.arg(
Arg::new(options::INODES)
.long(options::INODES)
.help(translate!("du-help-inodes"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::INODES),
)
.arg(
Arg::new(options::BLOCK_SIZE_1K)
.short('k')
.help(translate!("du-help-block-size-1k"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::BLOCK_SIZE_1K),
)
.arg(
Arg::new(options::COUNT_LINKS)
.short('l')
.long("count-links")
.help(translate!("du-help-count-links"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::COUNT_LINKS),
)
.arg(
Arg::new(options::DEREFERENCE)
.short('L')
.long(options::DEREFERENCE)
.help(translate!("du-help-dereference"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::DEREFERENCE),
)
.arg(
Arg::new(options::DEREFERENCE_ARGS)
.short('D')
.visible_short_alias('H')
.long(options::DEREFERENCE_ARGS)
.help(translate!("du-help-dereference-args"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::DEREFERENCE_ARGS),
)
.arg(
Arg::new(options::NO_DEREFERENCE)
.short('P')
.long(options::NO_DEREFERENCE)
.help(translate!("du-help-no-dereference"))
.overrides_with(options::DEREFERENCE)
.overrides_with(options::NO_DEREFERENCE)
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::BLOCK_SIZE_1M)
.short('m')
.help(translate!("du-help-block-size-1m"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::BLOCK_SIZE_1M),
)
.arg(
Arg::new(options::NULL)
.short('0')
.long("null")
.help(translate!("du-help-null"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::NULL),
)
.arg(
Arg::new(options::SEPARATE_DIRS)
.short('S')
.long("separate-dirs")
.help(translate!("du-help-separate-dirs"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::SEPARATE_DIRS),
)
.arg(
Arg::new(options::SUMMARIZE)
.short('s')
.long("summarize")
.help(translate!("du-help-summarize"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::SUMMARIZE),
)
.arg(
Arg::new(options::SI)
.long(options::SI)
.help(translate!("du-help-si"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::SI),
)
.arg(
Arg::new(options::ONE_FILE_SYSTEM)
.short('x')
.long(options::ONE_FILE_SYSTEM)
.help(translate!("du-help-one-file-system"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::ONE_FILE_SYSTEM),
)
.arg(
Arg::new(options::THRESHOLD)
Expand All @@ -1422,14 +1441,16 @@ pub fn uu_app() -> Command {
.value_name("SIZE")
.num_args(1)
.allow_hyphen_values(true)
.help(translate!("du-help-threshold")),
.help(translate!("du-help-threshold"))
.overrides_with(options::THRESHOLD),
)
.arg(
Arg::new(options::VERBOSE)
.short('v')
.long("verbose")
.help(translate!("du-help-verbose"))
.action(ArgAction::SetTrue),
.action(ArgAction::SetTrue)
.overrides_with(options::VERBOSE),
)
.arg(
Arg::new(options::EXCLUDE)
Expand Down Expand Up @@ -1467,13 +1488,15 @@ pub fn uu_app() -> Command {
PossibleValue::new("ctime").alias("status"),
PossibleValue::new("creation").alias("birth"),
]))
.help(translate!("du-help-time")),
.help(translate!("du-help-time"))
.overrides_with(options::TIME),
)
.arg(
Arg::new(options::TIME_STYLE)
.long(options::TIME_STYLE)
.value_name("STYLE")
.help(translate!("du-help-time-style")),
.help(translate!("du-help-time-style"))
.overrides_with(options::TIME_STYLE),
)
.arg(
Arg::new(options::FILE)
Expand Down
Loading
Loading