ls --dired -R: fix the positions #5341

Merged

cakebaker merged 10 commits intouutils:mainfrom

sylvestre:fix-subdir

Oct 19, 2023

Contributor

sylvestre commented Sep 30, 2023

No description provided.

github-actions bot commented Sep 30, 2023

GNU testsuite comparison:

GNU test failed: tests/ls/recursive. tests/ls/recursive is passing on 'main'. Maybe you have to rebase?

Contributor Author

sylvestre commented Sep 30, 2023

GNU testsuite comparison:

GNU test failed: tests/ls/recursive. tests/ls/recursive is passing on 'main'. Maybe you have to rebase?

I can reproduce. I will have a look
should be just a if config.dired

sylvestre mentioned this pull request

ls -R1: add a test to replicate GNU's recursive.sh #5342

Merged

sylvestre requested review from cakebaker and tertsdiepraam

October 1, 2023 20:27

cakebaker reviewed

View reviewed changes

tests/by-util/test_ls.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

tests/by-util/test_ls.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

tests/by-util/test_ls.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

tests/by-util/test_ls.rs Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

tests/by-util/test_ls.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

tests/by-util/test_ls.rs Show resolved Hide resolved

tertsdiepraam reviewed

View reviewed changes

Collaborator

tertsdiepraam left a comment

Oops, forgot to hit send on these comments :)

src/uu/ls/src/dired.rs Show resolved Hide resolved

src/uu/ls/src/dired.rs Outdated Show resolved Hide resolved

src/uu/ls/src/dired.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

src/uu/ls/src/ls.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

src/uu/ls/src/ls.rs Outdated Show resolved Hide resolved

cakebaker reviewed

View reviewed changes

src/uu/ls/src/ls.rs Outdated Show resolved Hide resolved

sylvestre and others added 7 commits

October 4, 2023 23:14


          move get_offset_from_previous_line into a specific function

4fbd379


          dired: improve the -R support

05b2e4b


          dired: fix the display with subdir

7b825f1


          ls --dired -R: fix the positions

22aa74b


          ls --dired -R: verify also the SUBDIRED coordinate

7c034db


          ls --dired -R: add a long file name and fix a windows test

68bcf23


          dired: always put dired first in the args + minor fixes

289c31c

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>

sylvestre requested review from cakebaker and tertsdiepraam

October 6, 2023 18:39


          Merge branch 'main' into fix-subdir

9d6c75a

Contributor Author

sylvestre commented Oct 12, 2023

@cakebaker I think it is now ok :)

cakebaker reviewed

View reviewed changes

Contributor

cakebaker left a comment

Looks good, though a rebase is needed.

sylvestre added 2 commits

October 19, 2023 10:46


          Merge branch 'main' into fix-subdir

3395d9d


          ls: add cognitive_complexity to silent a warning

eab2fd2

cakebaker approved these changes

View reviewed changes

cakebaker merged commit f971a69 into uutils:main

chenrui333 mentioned this pull request

uutils-coreutils 0.0.23 Homebrew/homebrew-core#154288

Merged

moonfruit mentioned this pull request

uutils-selected 0.0.23 moonfruit/homebrew-tap#59

Merged

naoNao89 mentioned this pull request

ls: Compatibility Tracking Issue #1872

Open

57 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet