Allow skipping only same-file duplicates with skipDuplicates: "same-file", fixes #601#602
Open
Nic-Polumeyv wants to merge 1 commit into
Open
Allow skipping only same-file duplicates with skipDuplicates: "same-file", fixes #601#602Nic-Polumeyv wants to merge 1 commit into
Nic-Polumeyv wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implements option 2 from #601:
skipDuplicatesnow accepts"same-file", which keeps skipping repeated imports of the same file but no longer skips different files that share the same content.The diff is small because the two dedup layers are already separate:
state.importedFileshandles same-file skips andstate.hashFileshandles same-content skips, both gated onoptions.skipDuplicatesbeing truthy."same-file"is truthy, so the same-file layer needs no change; the two content-layer checks now requireskipDuplicates === true. Behavior fortrueandfalseis unchanged, which the existingno-duplicate,same,duplicates, and cyclical fixtures already cover.The added fixture imports two byte-identical files from different directories plus one of them a second time: the repeated import is dropped by the same-file layer, and the identical-content file survives. The added test fails without the change and passes with it.
If you'd rather take one of the other directions from #601 instead, I'm happy to rework this.