merge: support 'identical' on overlapped data #44
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
The-42
requested changes
Oct 27, 2020
intelhex/__init__.py
Outdated
| @@ -863,9 +863,9 @@ def merge(self, other, overlap='error'): | |||
| raise TypeError('other should be IntelHex object') | |||
| if other is self: | |||
| raise ValueError("Can't merge itself") | |||
| if overlap not in ('error', 'ignore', 'replace'): | |||
| if overlap not in ('error', 'ignore', 'replace', 'check'): | |||
There was a problem hiding this comment.
Please amend the method's documentation a couple lines higher as well
There was a problem hiding this comment.
I agree that identical is clearer than check (even if it's not a verb as for other methods).
| ih2 = IntelHex({0:2}) | ||
| self.assertRaisesMsg(intelhex.AddressOverlapError, | ||
| 'Data at address 0x0 is different: 0x1 vs. 0x2', | ||
| ih1.merge, ih2, overlap='check') | ||
|
|
There was a problem hiding this comment.
The test in itself looks legit, but the test_merge_wrong_args right above this one now yields an incomplete message if triggered. Please add the new argument into that message and make it work again.
There was a problem hiding this comment.
Hum, seems that I didn't play the test... Any it's fixed.
I also updated the docs/
MarcFinetRtone
force-pushed
the
new-check-for-overlapping-data
branch
2 times, most recently
from
311e9b3 to
855fe8b
Compare
MarcFinetRtone
changed the title
|
v2:
|
When merging multiple .hex files, in case of overlap we sometimes need to just 'ensure' that values are identical. The new 'identical' mode ensures this. Note: the behavior for start_addr is currently a 'identical' (i.e. the overlap configuration is checked only when values differ). So we might want to change the behavior for data too: - if data is identical: silently bail out - add a 'stricter' mode that corresponds to the current behavior
MarcFinetRtone
force-pushed
the
new-check-for-overlapping-data
branch
from
855fe8b to
5e2b05b
Compare
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.
When merging multiple .hex files, in case of overlap we sometimes need to
just 'ensure' that values are identical.
The new 'check' mode ensures this.
Note: the behavior for start_addr is currently a 'check' (i.e. the
overlap configuration is checked only when values differ). So we might
want to change the behavior for data too: