find: Implement `-samefile` #389

hanbings · 2024-05-24T16:43:51Z

implement: #373

BFS test +1 PASS and GNU test PASS +8 / FAIL -20 in commit bc8ae98

codecov · 2024-05-24T16:47:01Z

Codecov Report

Attention: Patch coverage is 90.69767% with 4 lines in your changes missing coverage. Please review.

Project coverage is 65.43%. Comparing base (42075f5) to head (a523add).
Report is 4 commits behind head on main.

Files	Patch %	Lines
src/find/matchers/mod.rs	60.00%	1 Missing and 3 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #389      +/-   ##
==========================================
+ Coverage   64.96%   65.43%   +0.47%     
==========================================
  Files          32       33       +1     
  Lines        3810     3888      +78     
  Branches      874      892      +18     
==========================================
+ Hits         2475     2544      +69     
  Misses        993      993              
- Partials      342      351       +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

sylvestre · 2024-05-24T17:54:00Z

tests/find_cmd_tests.rs

+
+#[test]
+#[serial(working_dir)]
+#[cfg(target_os = "linux")]


why linux only ? :)

The -samefile option is primarily used in Linux/Unix systems to determine whether two files are the same file based on their inode (hard link) information.

The ino() method of the MetadataExt can be utilized to obtain the inode.
However, the equivalent file_index() method in std::os::windows::fs::MetadataExt (Rust Docs) on the Windows platform is still considered experimental, so I would recommend exercising caution when using it.

So actually I haven't implemented it on Windows platform yet (has left FIXME mark).

tavianator · 2024-05-27T15:56:57Z

tests/find_cmd_tests.rs

+
+#[test]
+#[serial(working_dir)]
+#[cfg(target_os = "linux")]


Suggested change

#[cfg(target_os = "linux")]

#[cfg(unix)]

Thanks. Modified in latest commit. This target is more suitable than linux. : )

tavianator · 2024-05-27T18:13:56Z

src/find/matchers/samefile.rs

+    #[cfg(unix)]
+    fn matches(&self, file_info: &walkdir::DirEntry, _matcher_io: &mut super::MatcherIO) -> bool {
+        let meta = file_info.metadata().unwrap();
+        meta.ino() == self.metadata.ino()


You also need to check meta.dev(). Otherwise you'll return true for two unrelated files on different filesystems that happen to get the same inode number.

Okay, I've added a check.

we have
https://github.com/uutils/coreutils/blob/8cac375dddb4d4e87519c137c45fa831ac7f2619/src/uucore/src/lib/features/fs.rs#L559
it would not be a good candidate ?

we have https://github.com/uutils/coreutils/blob/8cac375dddb4d4e87519c137c45fa831ac7f2619/src/uucore/src/lib/features/fs.rs#L559 it would not be a good candidate ?

Thanks! This has now been changed to uucore::fs::paths_refer_to_same_file in f612c0d and it works great!

sylvestre · 2024-06-15T07:03:05Z

And I waiting for #400 to review this first :)

github-actions · 2024-06-23T22:34:05Z

GNU testsuite comparison:

Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O2 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O3 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O2 is now passing!
Run GNU findutils tests: GNU tests summary = TOTAL: 706 / PASS: 441 / FAIL: 262 / ERROR: 2
Run GNU findutils tests: Changes from main: PASS +8 / FAIL -20 / ERROR +0 / SKIP +0 
Run BFS tests: Changes from main: PASS +0 / SKIP +0 / FAIL +0
Run BFS tests: BFS tests summary = TOTAL: 288 / PASS: 182 / SKIP: 1 / FAIL: 105

sylvestre · 2024-06-23T22:36:38Z

@hanbings is that expected ? :)
PASS +8 / FAIL -20 / ERROR +0 / SKIP +0

hanbings · 2024-06-23T22:43:33Z

If we mean the GNU/BFS tests for the code in this PR itself, yes.

github-actions · 2024-06-26T20:39:24Z

GNU testsuite comparison:

Run BFS tests: Changes from main: PASS +0 / SKIP +0 / FAIL +0
Run BFS tests: BFS tests summary = TOTAL: 288 / PASS: 182 / SKIP: 1 / FAIL: 105
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O2 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O3 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O2 is now passing!
Run GNU findutils tests: GNU tests summary = TOTAL: 706 / PASS: 441 / FAIL: 262 / ERROR: 2
Run GNU findutils tests: Changes from main: PASS +8 / FAIL -20 / ERROR +0 / SKIP +0

sylvestre · 2024-06-26T20:41:42Z

src/find/matchers/samefile.rs

+
+    #[cfg(not(unix))]
+    fn matches(&self, _file_info: &walkdir::DirEntry, _matcher_io: &mut super::MatcherIO) -> bool {
+        // FIXME


please create an issue for this once it landed

also, it supports windows?
https://github.com/uutils/coreutils/blob/92665144c9ddf100d5044dc0c52af122a94587d0/src/uu/split/src/platform/windows.rs#L47

also, it supports windows? https://github.com/uutils/coreutils/blob/92665144c9ddf100d5044dc0c52af122a94587d0/src/uu/split/src/platform/windows.rs#L47

Oh! That's right! Changed to support multiple platforms. Thanks!

github-actions · 2024-06-27T00:40:50Z

GNU testsuite comparison:

Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O2 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O3 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O2 is now passing!
Run GNU findutils tests: GNU tests summary = TOTAL: 706 / PASS: 441 / FAIL: 262 / ERROR: 2
Run GNU findutils tests: Changes from main: PASS +8 / FAIL -20 / ERROR +0 / SKIP +0 
Run BFS tests: Changes from main: PASS +0 / SKIP +0 / FAIL +0
Run BFS tests: BFS tests summary = TOTAL: 288 / PASS: 184 / SKIP: 1 / FAIL: 103

github-actions · 2024-06-27T00:42:42Z

GNU testsuite comparison:

Run BFS tests: Changes from main: PASS +0 / SKIP +0 / FAIL +0
Run BFS tests: BFS tests summary = TOTAL: 288 / PASS: 184 / SKIP: 1 / FAIL: 103
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O2 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-copy.new-O3 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O0 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O1 is now passing!
Run GNU findutils tests: Congrats! The GNU test samefile-link.new-O2 is now passing!
Run GNU findutils tests: GNU tests summary = TOTAL: 706 / PASS: 441 / FAIL: 262 / ERROR: 2
Run GNU findutils tests: Changes from main: PASS +8 / FAIL -20 / ERROR +0 / SKIP +0

hanbings marked this pull request as ready for review May 24, 2024 16:43

sylvestre reviewed May 24, 2024

View reviewed changes

cakebaker linked an issue May 25, 2024 that may be closed by this pull request

Implement -samefile #373

Closed

tavianator reviewed May 27, 2024

View reviewed changes

tavianator suggested changes May 27, 2024

View reviewed changes

hanbings added 5 commits May 30, 2024 23:13

implement samefile feature.

af66512

Fix windows module use.

e270705

Add test code.

bba21a5

Change the operating system target of the test.

99e2718

Added check for different devices.

47fce96

sylvestre force-pushed the implement-373 branch from 95f8466 to 47fce96 Compare May 30, 2024 21:13

sylvestre and others added 6 commits June 1, 2024 10:35

Merge branch 'main' into implement-373

7f53c20

Merge branch 'main' into implement-373

bc59d33

Resolve merge conflicts.

0cb923d

Changed to use paths_refer_to_same_file to compare two files.

9976ce9

Processing of non-existent files.

f612c0d

Merge branch 'main' into implement-373

e635c90

hanbings and others added 3 commits June 23, 2024 11:41

Merge branch 'main' into implement-373

a24f856

Merge branch 'main' into implement-373

3e6a823

Merge branch 'main' into implement-373

8ace12b

sylvestre mentioned this pull request Jun 23, 2024

Fix CI code for comment.yml #404

Merged

Merge branch 'main' into implement-373

175fdf1

sylvestre reviewed Jun 26, 2024

View reviewed changes

Added Windows platform support.

8f30143

Run cargo fmt.

a523add

sylvestre merged commit fa4cce8 into uutils:main Jun 27, 2024
19 checks passed

BrewTestBot mentioned this pull request Jun 29, 2024

uutils-findutils 0.6.0 Homebrew/homebrew-core#175943

Merged

hanbings deleted the implement-373 branch July 4, 2024 17:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

find: Implement `-samefile` #389

find: Implement `-samefile` #389

hanbings commented May 24, 2024 •

edited

Loading

codecov bot commented May 24, 2024 •

edited

Loading

sylvestre May 24, 2024

hanbings May 24, 2024

hanbings May 24, 2024

tavianator May 27, 2024

hanbings May 27, 2024

tavianator May 27, 2024

hanbings May 27, 2024

sylvestre Jun 1, 2024

hanbings Jun 7, 2024

sylvestre commented Jun 15, 2024

github-actions bot commented Jun 23, 2024

sylvestre commented Jun 23, 2024

hanbings commented Jun 23, 2024

github-actions bot commented Jun 26, 2024

sylvestre Jun 26, 2024

sylvestre Jun 26, 2024

hanbings Jun 27, 2024

github-actions bot commented Jun 27, 2024

github-actions bot commented Jun 27, 2024

find: Implement -samefile #389

find: Implement -samefile #389

Conversation

hanbings commented May 24, 2024 • edited Loading

codecov bot commented May 24, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sylvestre commented Jun 15, 2024

github-actions bot commented Jun 23, 2024

sylvestre commented Jun 23, 2024

hanbings commented Jun 23, 2024

github-actions bot commented Jun 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jun 27, 2024

github-actions bot commented Jun 27, 2024

find: Implement `-samefile` #389

find: Implement `-samefile` #389

hanbings commented May 24, 2024 •

edited

Loading

codecov bot commented May 24, 2024 •

edited

Loading