code: merge modifications back to the original file #32
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
Signed-off-by: Lonng <chris@lonng.org>
Codecov Report
@@ Coverage Diff @@
## master #32 +/- ##
================================================
- Coverage 86.9318% 86.3938% -0.5381%
================================================
Files 7 7
Lines 880 904 +24
================================================
+ Hits 765 781 +16
- Misses 73 77 +4
- Partials 42 46 +4 |
lonng
changed the title
kennytm
reviewed
May 10, 2019
code/restorer.go
Outdated
| patcher := diffmatchpatch.New() | ||
| diffs := patcher.DiffMain(buffer.String(), string(rewritedContent), true) | ||
| patches := patcher.PatchMake(diffs) | ||
| pathedContent, _ := patcher.PatchApply(patches, string(originContent)) |
There was a problem hiding this comment.
The Apply could error, no? Like if I deleted a failpoint.Eval invocation on the enabled file it will likely fail.
There was a problem hiding this comment.
PatchApply will not return errors, see: https://github.com/sergi/go-diff/blob/HEAD/diffmatchpatch/patch.go#L232:28
There was a problem hiding this comment.
Could we consider the apply failed if the returned array contained at least one false entry?
Signed-off-by: Lonng <chris@lonng.org>
kennytm
reviewed
May 11, 2019
Signed-off-by: Lonng <chris@lonng.org>
lonng
force-pushed
the
lonng/restore-merge
branch
from
90dc824
to
4e3fc51
Compare
winkyao
approved these changes
May 12, 2019
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.
Signed-off-by: Lonng chris@lonng.org
What problem does this PR solve?
If we do the following steps:
failpoint-ctl enablefailpoint-ctl disableWe will lose modifications in step2
What is changed and how it works?
Merge modifications back to the original file
Check List
Tests
Side effects
Related changes