Sort diff-driver output by scope as final tiebreaker#218
Merged
Conversation
PR #166 added scope to each output line but the sort comparator still only considered name and version. When a lockfile lists the same package and version under more than one scope (e.g. Pipfile.lock default + develop), those entries compared equal and sort.Slice ordered them however the parser emitted them, producing spurious diff hunks. Fixes #217
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.
PR #166 added scope to each diff-driver output line but the sort comparator in
convertLockfilestill only considered name and version. When a lockfile lists the same package and version under more than one scope (e.g. Pipfile.lockdefault+develop, or npm with nested dev/prod copies), those entries compared equal andsort.Sliceordered them however the parser emitted them, sogit diffshowed hunks where nothing had actually changed.This adds
Scopeas the third sort key and a regression test using a Pipfile.lock with packages duplicated across both sections.Fixes #217