Fix a couple of CommentAsPatch issues. #14804
Merged
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
|
Cutdiffaroundline also needs to have some protection against truly pathological diffs. E.g. single line minimised js file becomes unminimised and you comment on one of the lines It's also essentially a duplicating some of the parsepatch code. |
GiteaBot
added
the
lgtm/need 2
zeripath
commented
Feb 25, 2021
6 tasks
zeripath
changed the title
… always represent part of the header of a diff. This PR adds a flag to its parsing to prevent this problem and adds a streaming parsing technique to CutDiffAroundLine using an io.pipe instead of just sending data to an unbounded buffer. Fix go-gitea#14711 Signed-off-by: Andrew Thornton <art27@cantab.net>
When making comment patches unfortunately the patch does not always quote the filename This makes the diff --git header ambiguous again. This PR finally adds handling for ambiguity in to parse patch Fix go-gitea#14812 Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
force-pushed
the
fix-oracle-diff-issue
branch
from
83393bd
to
bc2d0f3
Compare
There is no way currently for CutDiffAroundLine in this test to cause an error however, it should still be tested. Signed-off-by: Andrew Thornton <art27@cantab.net>
6543
approved these changes
Feb 27, 2021
GiteaBot
added
lgtm/need 1
Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
approved these changes
Feb 27, 2021
GiteaBot
added
lgtm/done
|
🚀 |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 27, 2021
Backport go-gitea#14804 * CutDiffAroundLine makes the incorrect assumption that `---` and `+++` always represent part of the header of a diff. This PR adds a flag to its parsing to prevent this problem and adds a streaming parsing technique to CutDiffAroundLine using an io.pipe instead of just sending data to an unbounded buffer. Fix go-gitea#14711 Signed-off-by: Andrew Thornton <art27@cantab.net> * Handle unquoted comment patch files When making comment patches unfortunately the patch does not always quote the filename This makes the diff --git header ambiguous again. This PR finally adds handling for ambiguity in to parse patch Fix go-gitea#14812 Signed-off-by: Andrew Thornton <art27@cantab.net> * Add in testing for no error There is no way currently for CutDiffAroundLine in this test to cause an error however, it should still be tested. Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
pushed a commit
that referenced
this pull request
Feb 28, 2021
Backport #14804 * CutDiffAroundLine makes the incorrect assumption that `---` and `+++` always represent part of the header of a diff. This PR adds a flag to its parsing to prevent this problem and adds a streaming parsing technique to CutDiffAroundLine using an io.pipe instead of just sending data to an unbounded buffer. Fix #14711 * Handle unquoted comment patch files When making comment patches unfortunately the patch does not always quote the filename This makes the diff --git header ambiguous again. This PR finally adds handling for ambiguity in to parse patch Fix #14812 * Add in testing for no error There is no way currently for CutDiffAroundLine in this test to cause an error however, it should still be tested. Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
CutDiffAroundLine makes the incorrect assumption that
---and+++always represent part of the header of a diff.This PR adds a flag to its parsing to prevent this problem and adds a streaming parsing technique to CutDiffAroundLine using an io.pipe instead of just sending data to an unbounded buffer.
Handle unquoted comment patch filenames
When making comment patches unfortunately the patch does not always quote the filename. This makes the diff --git header ambiguous again.
This PR finally adds handling for ambiguity in to parse patch
Fix #14711
Fix #14812
Signed-off-by: Andrew Thornton art27@cantab.net