Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor how group endings are detected in generated C# code #5686

Merged
merged 4 commits into from
Feb 11, 2019
Merged

Refactor how group endings are detected in generated C# code #5686

merged 4 commits into from
Feb 11, 2019

Conversation

ObsidianMinor
Copy link
Contributor

Related to #5676. This reverts the generated unknown field handling to it's original form from before #5183 so now the compiler will add a switch case to generated group messages for the end tag.

@TeBoring TeBoring self-requested a review February 7, 2019 21:32
@TeBoring TeBoring self-assigned this Feb 7, 2019
@TeBoring TeBoring added the c# label Feb 7, 2019
@TeBoring
Copy link
Contributor

TeBoring commented Feb 7, 2019

I guess you need to run ./generate_descriptors.sh in root dir.

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

@googlebot googlebot added cla: no and removed cla: yes labels Feb 8, 2019
@ObsidianMinor ObsidianMinor force-pushed the refactor/group-endings branch from b2238d8 to d8ff3de Compare February 8, 2019 01:44
@googlebot
Copy link

CLAs look good, thanks!

@googlebot googlebot added cla: yes and removed cla: no labels Feb 8, 2019
@ObsidianMinor
Copy link
Contributor Author

ObsidianMinor commented Feb 8, 2019 •
edited
Loading

Ran the script (ignore the CLA notice, I made a mistake when entering my name and email in my Ubuntu on Windows installation)

@TeBoring TeBoring added this to the v3.7.0 milestone Feb 11, 2019
@TeBoring TeBoring merged commit 2a05691 into protocolbuffers:master Feb 11, 2019
TeBoring pushed a commit to TeBoring/protobuf that referenced this pull request Feb 11, 2019
@ObsidianMinor @TeBoring
Refactor how group endings are detected in generated C# code (protoco…
dbf77c6 
…lbuffers#5686)

* Modify how end tags are encounted in merge code (compiler)

* Modify how end tags are encounted in merge code (generated)

* Modify how end tags are encounted in merge code (library)

* Regenerate generated code through generate_descriptor_proto.sh
TeBoring added a commit that referenced this pull request Feb 12, 2019
@TeBoring
Merge pull request #5708 from TeBoring/3.7.x-cherry-pick
4de1551 
Cherry-pick (#5686) to 3.7.x
@ObsidianMinor ObsidianMinor deleted the refactor/group-endings branch February 12, 2019 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeBoring TeBoring TeBoring approved these changes

Assignees

@TeBoring TeBoring

Labels
c# cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ObsidianMinor @TeBoring @googlebot @kokoro-team