date: fix interaction of flags, fix issues around --set #6142

BenWiederhake · 2024-03-29T16:15:48Z

This PR fixes multiple issues around multi-flags:

Many repeated flags used to be handled incorrectly; this is work toward Allow repeated flags much more often #5998
We used to accept the --reference argument, but completely ignored it. Yikes!
Input, parsing, and output of --set was completely broken. This fixes it largely.
Input options (-d, -f, -r), formatting options (-I, -R, --rfc-3339), and --set are often mutually-exclusive, with the exception that input options override themselves (but not each other), and also --set can be combined with formatting options.

Some things are unfixable, in particular the order-sensitive behavior; see #4254#issuecomment-2026446634 and uutils/uutils-args#113

github-actions · 2024-03-29T16:44:07Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)

BenWiederhake · 2024-03-29T16:44:45Z

"CICD / Build (macos-latest, x86_64-apple-darwin, feat_os_macos)" flaked:

---- test_stat::test_stdin_pipe_fifo1 stdout ----
run: /Users/runner/work/coreutils/coreutils/target/x86_64-apple-darwin/debug/coreutils stat -
run: /Users/runner/work/coreutils/coreutils/target/x86_64-apple-darwin/debug/coreutils stat -L -
thread 'test_stat::test_stdin_pipe_fifo1' panicked at ''  File: -
  Size: 0         	Blocks: 0          IO Block: 512    weird file
Device: 25d29ea1h/634560161d	Inode: 2178033826  Links: 0
Access: (0660/?rw-rw----)  Uid: (  501/  runner)   Gid: (   20/   staff)
Access: 2024-03-29 16:28:42.942290340 +0000
Modify: 2024-03-29 16:28:42.942290340 +0000
Change: 2024-03-29 16:28:42.942290340 +0000
 Birth: 1970-01-01 00:00:00.000000000 +0000
' does not contain 'fifo'', tests/by-util/test_stat.rs:286:10

All other failures appear to be known issues, too.

BenWiederhake · 2024-03-30T15:00:02Z

Changes since last push:

Rebased on current main
Resolved trivial conflict in test_date.rs with date -f dates.txt is failing #4657

BenWiederhake · 2024-03-30T15:08:06Z

Changes since last push:

While resolving the conflict, I accidentally dropped the #[test] marker for a test. Whoops! Added it back in.

BenWiederhake · 2024-03-31T20:37:09Z

Changes since last push:

Rebased to new main, due to conflict with date: support -f - to read from stdin #6160

github-actions · 2024-03-31T21:10:50Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

BenWiederhake · 2024-04-06T21:30:28Z

Changes since last push: Nothing, just a rebase to show that it's still a good idea to do this.

github-actions · 2024-04-06T22:48:23Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)

BenWiederhake · 2024-05-02T14:45:16Z

CI failures seem to be only flakes:

grcov Windows CI is broken #6331
flaky CI macos: test_install_and_strip "Wait: Timeout of '30s' reached" #6275
Plus some stuff that looks like pinky: fix off-by-one in GECOS parsing #3155?

Example:

---- test_pinky::test_short_format_q stdout ----
run: /Users/runner/work/coreutils/coreutils/target/x86_64-apple-darwin/debug/coreutils pinky -q
thread 'test_pinky::test_short_format_q' panicked at 'Command was expected to succeed. code: 101
stdout = Login     TTY      When            
runner   *console 
 stderr = thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: IndeterminateOffset', src/uucore/src/lib/features/utmpx.rs:192:62
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
', tests/by-util/test_pinky.rs:97:40

BenWiederhake · 2024-07-03T02:57:29Z

Changes since last push:

Rebased to new main
Nothing more, I just want to remind that this PR exists and is still a good idea.

~~What else needs to be done?~~
EDIT: Those CI failures look suspicious, I'll have a look.

sylvestre · 2024-07-09T21:16:04Z

src/uu/date/src/date.rs

    };

-    if let Some(date) = settings.set_to {
+    // Iterate over all dates - whether it's a single date or a file.
+    let dates: Box<dyn Iterator<Item = _>> = if let Some(date_string) = &settings.set_to {


it is starting to be a long function.
maybe split it ?

sylvestre · 2024-07-09T21:16:30Z

src/uu/date/src/date.rs

-                        .replace("%f", "%N");
-                    println!("{formatted}");
+    // Format all the dates
+    for date in dates {


like can the content of this loop be in a function ?

sylvestre · 2024-07-09T21:17:11Z

tests/by-util/test_date.rs

+        vec!["-f", "foo", "-r", "foo"],
+        // Format with other format
+        vec!["-I", "-R"],
+        vec!["-I", "--rfc-3339=date"],


BenWiederhake · 2024-08-11T21:35:51Z

Changes since last push:

Rebase on current main (that's around 100 commits!)
Split the gargantuan uumain function into four separate functions, as requested, and remove the corresponding clippy lint.

The only CI failure is #6534, as usual.

github-actions · 2024-08-11T21:56:19Z

GNU testsuite comparison:

Congrats! The gnu test tests/timeout/timeout is no longer failing!

sylvestre · 2024-12-02T09:37:27Z

@BenWiederhake sorry for the latency, it needs a small rebase

This was referenced Mar 29, 2024

date: implement --resolution #6143

Open

Allow repeated flags much more often #5998

Open

BenWiederhake mentioned this pull request Mar 29, 2024

test_stdin_pipe_fifo1 flakes with "weird file" on MacOS #6145

Open

BenWiederhake force-pushed the dev-date-repeated branch from 8ee3b47 to 8439990 Compare March 30, 2024 14:59

BenWiederhake force-pushed the dev-date-repeated branch from 8439990 to f71592a Compare March 30, 2024 15:07

sylvestre force-pushed the dev-date-repeated branch from f71592a to 7a60db5 Compare March 30, 2024 21:51

BenWiederhake mentioned this pull request Mar 31, 2024

date: support -f - to read from stdin #6160

Merged

BenWiederhake force-pushed the dev-date-repeated branch from 7a60db5 to 88c69a3 Compare March 31, 2024 20:36

BenWiederhake force-pushed the dev-date-repeated branch from 88c69a3 to a3c918a Compare April 6, 2024 21:29

BenWiederhake force-pushed the dev-date-repeated branch from a3c918a to 0d0847a Compare May 2, 2024 11:55

BenWiederhake mentioned this pull request May 2, 2024

grcov Windows CI is broken #6331

Closed

BenWiederhake requested a review from tertsdiepraam May 2, 2024 14:45

BenWiederhake mentioned this pull request May 2, 2024

flaky CI macos: IndeterminateOffset and too new GNU #6333

Closed

BenWiederhake force-pushed the dev-date-repeated branch from 0d0847a to 48ddf40 Compare July 3, 2024 02:56

sylvestre force-pushed the dev-date-repeated branch 2 times, most recently from aa5120d to 5264cb8 Compare July 9, 2024 21:13

sylvestre reviewed Jul 9, 2024

View reviewed changes

BenWiederhake mentioned this pull request Jul 14, 2024

date: Rework argument processing #6560

Closed

date: mark unfixable argument handlers, prepare tests

703cf62

BenWiederhake mentioned this pull request Aug 11, 2024

date: invalid format items should be emitted verbatim, and not cause an error #6635

Open

BenWiederhake added 9 commits August 11, 2024 23:29

date: enable repeating trivial flags

5f5b04d

date: implement and test reference resolution-order

dcf5b66

date: enable repeating --set

3700474

date: produce output on --set

21876ab

date: improve range of accepted values for --set

08bf2c7

date: forbid conflicting options

9a740ca

date: refactor argument parsing into their own methods

4326e3e

date: refactor date computation into its own method

e7d618f

date: refactor date printing into its own method

d3be43e

BenWiederhake force-pushed the dev-date-repeated branch from 5264cb8 to d3be43e Compare August 11, 2024 21:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

date: fix interaction of flags, fix issues around --set #6142

date: fix interaction of flags, fix issues around --set #6142

BenWiederhake commented Mar 29, 2024

github-actions bot commented Mar 29, 2024

BenWiederhake commented Mar 29, 2024

BenWiederhake commented Mar 30, 2024

BenWiederhake commented Mar 30, 2024

BenWiederhake commented Mar 31, 2024

github-actions bot commented Mar 31, 2024

BenWiederhake commented Apr 6, 2024 •

edited

Loading

github-actions bot commented Apr 6, 2024

BenWiederhake commented May 2, 2024

BenWiederhake commented Jul 3, 2024 •

edited

Loading

sylvestre Jul 9, 2024

sylvestre Jul 9, 2024

sylvestre Jul 9, 2024

BenWiederhake commented Aug 11, 2024

github-actions bot commented Aug 11, 2024

sylvestre commented Dec 2, 2024

date: fix interaction of flags, fix issues around --set #6142

Are you sure you want to change the base?

date: fix interaction of flags, fix issues around --set #6142

Conversation

BenWiederhake commented Mar 29, 2024

github-actions bot commented Mar 29, 2024

BenWiederhake commented Mar 29, 2024

BenWiederhake commented Mar 30, 2024

BenWiederhake commented Mar 30, 2024

BenWiederhake commented Mar 31, 2024

github-actions bot commented Mar 31, 2024

BenWiederhake commented Apr 6, 2024 • edited Loading

github-actions bot commented Apr 6, 2024

BenWiederhake commented May 2, 2024

BenWiederhake commented Jul 3, 2024 • edited Loading

sylvestre Jul 9, 2024

Choose a reason for hiding this comment

sylvestre Jul 9, 2024

Choose a reason for hiding this comment

sylvestre Jul 9, 2024

Choose a reason for hiding this comment

BenWiederhake commented Aug 11, 2024

github-actions bot commented Aug 11, 2024

sylvestre commented Dec 2, 2024

BenWiederhake commented Apr 6, 2024 •

edited

Loading

BenWiederhake commented Jul 3, 2024 •

edited

Loading