Skip to content

gh-57141: Add dircmp shallow option.#109499

Merged
encukou merged 3 commits intopython:mainfrom
aunzat:dircmp-non-shallow
Mar 4, 2024
Merged

gh-57141: Add dircmp shallow option.#109499
encukou merged 3 commits intopython:mainfrom
aunzat:dircmp-non-shallow

Conversation

@aunzat
Copy link
Contributor

@aunzat aunzat commented Sep 16, 2023 •
edited by github-actions bot
Loading

Add support for non shallow file comparison for filecmp.dircmp like there is for filecmp.cmp and filecmp.cmpfiles.

Based on (BPO) patch from @planet36. I have added unittests for the shallow options and
reorganized the tests somewhat. Maybe a "new in version" should be added to the documentation?

Co-authored-by: Steve Ward planet36@gmail.com

Issue: #57141

📚 Documentation preview 📚: https://cpython-previews--109499.org.readthedocs.build/

@ghost
Copy link

ghost commented Sep 16, 2023 •
edited by ghost
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app bedevere-app bot mentioned this pull request Sep 16, 2023
Closed
CuriousLearner
CuriousLearner reviewed Sep 16, 2023
View reviewed changes
CuriousLearner
CuriousLearner requested changes Sep 16, 2023
View reviewed changes
Copy link
Member

@CuriousLearner CuriousLearner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Tobias @aunzat 👋🏼

Thanks for your contributions!

Seems like the test case test_dircmp_shallow_same_file is failing. Can you please take a look?

I have a few suggestions mentioned inline.

Since this is your first contribution, if you prefer, you may add your name to Misc/ACKS file.

@aunzat
Copy link
Contributor Author

aunzat commented Sep 17, 2023

@CuriousLearner, thanks for comments

Seems like the test case test_dircmp_shallow_same_file is failing. Can you please take a look?

Fixed

I have a few suggestions mentioned inline.

Perfect, I have updated it accordingly.

@aunzat aunzat marked this pull request as draft September 25, 2023 16:18
@aunzat aunzat force-pushed the dircmp-non-shallow branch 2 times, most recently from e80c210 to 437b076 Compare September 26, 2023 05:02
@aunzat @planet36 @CuriousLearner
pythongh-57141: Add dircmp shallow option.
8671e21 
Co-authored-by: Steve Ward <planet36@gmail.com>
Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@aunzat aunzat marked this pull request as ready for review September 27, 2023 06:21
@encukou
Copy link
Member

encukou commented Mar 4, 2024

Maybe a "new in version" should be added to the documentation

For a new argument, there's versionchanged -- see the devguide.
I've uptated the branch, added the directive, and tested locally; since I had the commit I pushed it here directly rather than add a suggestion.

@encukou encukou enabled auto-merge (squash) March 4, 2024 16:48
@encukou encukou merged commit 60743a9 into python:main Mar 4, 2024
woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024
@aunzat @planet36
@CuriousLearner @woodruffw
pythongh-57141: Add dircmp shallow option (pythonGH-109499)
ae69e6c 
Co-authored-by: Steve Ward <planet36@gmail.com>
Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@aunzat aunzat deleted the dircmp-non-shallow branch March 4, 2024 19:17
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
@aunzat @planet36
@CuriousLearner @adorilson
pythongh-57141: Add dircmp shallow option (pythonGH-109499)
6618d7a 
Co-authored-by: Steve Ward <planet36@gmail.com>
Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@aunzat @planet36
@CuriousLearner @diegorusso
pythongh-57141: Add dircmp shallow option (pythonGH-109499)
cdf508c 
Co-authored-by: Steve Ward <planet36@gmail.com>
Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@max-muoto max-muoto mentioned this pull request Jul 13, 2024
Merged
facebook-github-bot pushed a commit to facebookincubator/cinder that referenced this pull request May 28, 2025
@halfacroissant @facebook-github-bot
Backport gh-57141: Add dircmp shallow option
7260486 
Summary:
Backport of gh-57141: Add dircmp shallow option

Upstream PR: python/cpython#109499
Issue Link:  python/cpython#57141
Merge Commit being ported: python/cpython@60743a9

Reviewed By: itamaro

Differential Revision: D75456517

fbshipit-source-id: 88df6363f6a834e51d489397ece5dbd2275650dd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CuriousLearner CuriousLearner Awaiting requested review from CuriousLearner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@aunzat @encukou @CuriousLearner