unify: unified_patches duplicates fix #110
Closed
Conversation
This file contains 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
* FIX Fixes the way in which handled conflicts are unified so that the Merger's unified_patches does not contain duplicate patches and can always be applied. Signed-off-by: Iuliana Voinea <[email protected]>
jirikuncar
reviewed
Jun 25, 2018
| @@ -37,7 +37,8 @@ def unify(self, first_patches, second_patches, conflicts): | |||
| if conflict.take_patch() != patch: | |||
| continue | |||
|
|
|||
| self.unified_patches.append(patch) | |||
| if patch not in self.unified_patches: | |||
There was a problem hiding this comment.
This might be quite slow if you have a long list of unified_patches.
There was a problem hiding this comment.
Do you have any suggestions perhaps?
There was a problem hiding this comment.
Using a separate set for the lookup.
There was a problem hiding this comment.
I would even propose a change to this method:
unified_patches = set()
self._build_index(conflicts)
sorted_patches = sorted(first_patches + second_patches, key=get_path)
for patch in sorted_patches:
conflict = self._index.get(nested_hash(patch))
# Apply only the patches that were taken as part of conflict
# resolution.
if conflict:
if conflict.take_patch() != patch:
continue
if patch not in unified_patches:
unified_patches.add(patch)
yield patchThere was a problem hiding this comment.
also _build_index method could become static and simply return the conflict mapping.
There was a problem hiding this comment.
@jirikuncar I think maybe before this commit the bug was not here?
There was a problem hiding this comment.
@iulianav maybe instead of sorting the lists should be merged.
>>> a = [1, 4, 3, 2]
>>> b = [1, 5, 3]
>>> merge_keys(a, b)
[1, 4, 5, 3, 2]
|
Closing PR because it's been stale for a long time. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
FIX Fixes the way in which handled conflicts are unified so that the
Merger's unified_patches does not contain duplicate patches and can
always be applied.
Related issue: Unifier class:
unifymethod returns duplicated patches #109Signed-off-by: Iuliana Voinea [email protected]