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

Expect same message types in mergeFromMessage #661

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Expect same message types in mergeFromMessage #661

wants to merge 16 commits into from

Commits on May 24, 2022

  1. Implement fast path when merging fields of same message 

    Fixes google#60
    @osa1
    osa1 committed May 24, 2022
    Configuration menu
    Copy the full SHA
    a0976da View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Merge remote-tracking branch 'origin/master' into merge_fast_path

    @osa1
    osa1 committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    504ee53 View commit details
    Browse the repository at this point in the history

  2. Post merge fixups, add a benchmark program

    @osa1
    osa1 committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    1ba216c View commit details
    Browse the repository at this point in the history

  3. Rename sameMessage -> sameMessageType

    @osa1
    osa1 committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    cd64518 View commit details
    Browse the repository at this point in the history

  4. Remove dynamic calls

    @osa1
    osa1 committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    e45dd01 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. Merge remote-tracking branch 'origin/master' into merge_fast_path

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    067130f View commit details
    Browse the repository at this point in the history

  2. Assume same message type in mergeFromMessage

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    682301c View commit details
    Browse the repository at this point in the history

  3. Rename a variable in mergeNonExtensionField for consistency with merg… 

    …eExtensionField
    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    5d4d5d0 View commit details
    Browse the repository at this point in the history

  4. Refactor null handling when merging extension fields for consistency … 

    …with non-extension fields
    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    da3971e View commit details
    Browse the repository at this point in the history

  5. Refactor merge methods for exts and non-exts; they're almost identica… 

    …l now
    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    cacd006 View commit details
    Browse the repository at this point in the history

  6. More refactoring

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    3cccb8f View commit details
    Browse the repository at this point in the history

  7. Make Dart 2.12 happy

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    8d5aa03 View commit details
    Browse the repository at this point in the history

  8. Tweak type casts, add final to locals

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    1dddc1b View commit details
    Browse the repository at this point in the history

  9. More refactoring

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    aa492a9 View commit details
    Browse the repository at this point in the history

  10. Merge merge field methods

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    d295939 View commit details
    Browse the repository at this point in the history

  11. Update docs

    @osa1
    osa1 committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    88c3d85 View commit details
    Browse the repository at this point in the history