date: fix %Z specifier does not print TZ abbr #5164

KrishnaNagam · 2023-08-15T17:00:43Z

fixes issue #3756 for date util

description:
chrono crate ignores %Z specifier. only prints timezone offset. added crates chrono-tz and iana_time_zone to calculate the timezone abbreviation and replace %Z specifier with the the abbreviation.

tertsdiepraam · 2023-08-16T06:29:13Z

Cool! Having two additional crates is a bit unfortunate, but if that is the best solution it's alright. I think the CI is failing because you didn't push changes to Cargo.lock.

KrishnaNagam · 2023-08-16T16:31:24Z

Yeah! chrono v0.5 supposed to have a fix for this. will revisit this once v0.5 is released.
chronotope/chrono#970.

BTW, I have pushed the cargo.lock changes.

KrishnaNagam · 2023-08-17T03:10:17Z

Still CI is failing.
I have enabled Github Actions in my repo to run these tests myself. I will come back once all tests are passed.

tertsdiepraam · 2023-08-18T21:12:22Z

Yeah! chrono v0.5 supposed to have a fix for this.

While you're fixing the tests, it might be nice to add a comment with this info to the code.

github-actions · 2023-08-19T09:18:06Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail-2/inotify-dir-recreate

KrishnaNagam · 2023-08-19T17:32:07Z

Oops! I accidentally merged main branch again 😅
Now its waiting for CI 😳.

pawelngei · 2023-11-21T13:49:51Z

src/uu/date/src/date.rs

@@ -397,7 +406,7 @@ fn make_format_string(settings: &Settings) -> &str {
            Rfc3339Format::Ns => "%F %T.%f%:z",
        },
        Format::Custom(ref fmt) => fmt,
-        Format::Default => "%c",
+        Format::Default => "%a %b %-d %X %Z %Y",


Layman's question: Will this not override any locales from LC_TIME we could use? That could be a blocker for #3143

Yes, but this change doesn't make it any worse than then the current implementation 😄

github-actions · 2023-12-25T15:38:00Z

GNU testsuite comparison:

Congrats! The gnu test tests/mv/dir2dir is no longer failing!
Skipping an intermittent issue tests/tail/inotify-dir-recreate

tertsdiepraam · 2024-02-02T10:42:01Z

src/uu/date/src/date.rs

+                    let format_string = &format_string
+                        .replace("%N", "%f")
+                        .replace("%Z", tz_abbreviation);


This is not quite correct, because this means that %f should be escaped. Ultimately, we might need to completely customize this. I suppose it's good enough for now though.

Actually, this line of code was already there. Cargo fmt has put it in new line 😀. I am interested in solving this though in my next PR.

I didn't get why %f need to be escaped. Did you mean, if there is %f already within the input, it should be escaped?

tertsdiepraam · 2024-02-02T10:49:01Z

src/uu/date/src/date.rs

@@ -397,7 +406,7 @@ fn make_format_string(settings: &Settings) -> &str {
            Rfc3339Format::Ns => "%F %T.%f%:z",
        },
        Format::Custom(ref fmt) => fmt,
-        Format::Default => "%c",
+        Format::Default => "%a %b %-d %X %Z %Y",


Yes, but this change doesn't make it any worse than then the current implementation 😄

github-actions · 2024-02-02T11:21:43Z

GNU testsuite comparison:

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

added space padding for day in default format

fix Cargo.lock

KrishnaNagam · 2024-04-21T03:11:32Z

tests/by-util/test_date.rs

-            "Mon Mar 27 08:30:00 2023\n\
-             Sat Apr  1 12:00:00 2023\n\
-             Sat Apr 15 18:30:00 2023\n",
+            "Mon Mar 27 08:30:00 UTC 2023\n\


@tertsdiepraam
I have updated test case test_date_from_stdin, to align with the fix.

github-actions · 2024-04-21T12:59:39Z

GNU testsuite comparison:

GNU test failed: tests/cksum/md5sum. tests/cksum/md5sum is passing on 'main'. Maybe you have to rebase?
GNU test failed: tests/cksum/sha1sum. tests/cksum/sha1sum is passing on 'main'. Maybe you have to rebase?
GNU test failed: tests/cp/same-file. tests/cp/same-file is passing on 'main'. Maybe you have to rebase?
GNU test failed: tests/factor/factor. tests/factor/factor is passing on 'main'. Maybe you have to rebase?
Congrats! The gnu test tests/timeout/timeout is no longer failing!
GNU test failed: tests/cp/cross-dev-symlink. tests/cp/cross-dev-symlink is passing on 'main'. Maybe you have to rebase?

KrishnaNagam · 2024-04-30T18:18:52Z

Is this PR good enough to merge?
Please let me know if any changes required.

github-actions · 2024-04-30T19:00:26Z

GNU testsuite comparison:

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

fix: replace %Z specifier with locale TZ abbr

510c73a

KrishnaNagam mentioned this pull request Aug 15, 2023

date behaves differently with no args #3756

Open

KrishnaNagam changed the title ~~fix: replace %Z specifier with locale TZ abbr~~ date: fix %Z specifier does not print TZ abbr Aug 15, 2023

formatted code with cargo fmt

1fad29c

date: added cargo.lock changes

f5a4e54

KrishnaNagam added 2 commits August 19, 2023 06:32

Moved iana-time-zone, chrono-tz to root cargo.toml

ab2b30c

Merge branch 'uutils:main' into main

c1ca29e

KrishnaNagam added 2 commits August 19, 2023 19:10

Merge branch 'uutils:main' into main

39f3318

Merge branch 'main' into main

be50227

Merge branch 'main' into main

1b78a3a

pawelngei reviewed Nov 21, 2023

View reviewed changes

Merge branch 'main' into main

6c636d8

tertsdiepraam approved these changes Feb 2, 2024

View reviewed changes

Merge branch 'main' into main

c118bdc

KrishnaNagam added 8 commits April 20, 2024 09:36

Merge remote-tracking branch 'upstream/main'

ba41cdb

fix chrono imports

140e108

fix test cases;

4dd0dfc

added space padding for day in default format

cargo fmt date.rs

9f97969

Seperated test case for macos

a196ea6

cargo fmt

543b017

fix Cargo.lock

2609582

Merge pull request #3 fix Cargo.lock

4e434ea

fix Cargo.lock

Merge branch 'main' into main

3246522

KrishnaNagam commented Apr 21, 2024

View reviewed changes

Merge branch 'main' into main

06158ac

KrishnaNagam mentioned this pull request Apr 21, 2024

date -d"@1690466034" isn't supported #5177

Open

Merge branch 'main' into main

2033816

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

date: fix %Z specifier does not print TZ abbr #5164

date: fix %Z specifier does not print TZ abbr #5164

KrishnaNagam commented Aug 15, 2023

tertsdiepraam commented Aug 16, 2023

KrishnaNagam commented Aug 16, 2023

KrishnaNagam commented Aug 17, 2023

tertsdiepraam commented Aug 18, 2023

github-actions bot commented Aug 19, 2023

KrishnaNagam commented Aug 19, 2023

pawelngei Nov 21, 2023

tertsdiepraam Feb 2, 2024

github-actions bot commented Dec 25, 2023

tertsdiepraam Feb 2, 2024

KrishnaNagam Apr 21, 2024

tertsdiepraam Feb 2, 2024

github-actions bot commented Feb 2, 2024

KrishnaNagam Apr 21, 2024

github-actions bot commented Apr 21, 2024

KrishnaNagam commented Apr 30, 2024

github-actions bot commented Apr 30, 2024

date: fix %Z specifier does not print TZ abbr #5164

Are you sure you want to change the base?

date: fix %Z specifier does not print TZ abbr #5164

Conversation

KrishnaNagam commented Aug 15, 2023

tertsdiepraam commented Aug 16, 2023

KrishnaNagam commented Aug 16, 2023

KrishnaNagam commented Aug 17, 2023

tertsdiepraam commented Aug 18, 2023

github-actions bot commented Aug 19, 2023

KrishnaNagam commented Aug 19, 2023

pawelngei Nov 21, 2023

Choose a reason for hiding this comment

tertsdiepraam Feb 2, 2024

Choose a reason for hiding this comment

github-actions bot commented Dec 25, 2023

tertsdiepraam Feb 2, 2024

Choose a reason for hiding this comment

KrishnaNagam Apr 21, 2024

Choose a reason for hiding this comment

tertsdiepraam Feb 2, 2024

Choose a reason for hiding this comment

github-actions bot commented Feb 2, 2024

KrishnaNagam Apr 21, 2024

Choose a reason for hiding this comment

github-actions bot commented Apr 21, 2024

KrishnaNagam commented Apr 30, 2024

github-actions bot commented Apr 30, 2024