Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(455)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed)

Created:
9 years, 8 months ago by agl
Modified:
9 years, 7 months ago
Reviewers:
Ilya Sherman
CC:
chromium-reviews, GeorgeY
Visibility:
Public.

Description

third_party/protobuf: update to upstream r371 1) Got an upstream diff 346:371 from svn 2) Pruned files from the diff that we don't have, as well as descriptor.pb.* 3) Applied and fixed the merge failures. 4) Copied the code (less descriptor.pb.*) back into the svn source. 5) Manually fixed descriptor.pb.* and plugin.pb.* there. 6) Ran ./generate_descriptor_proto.sh and copied the updated files back. 7) Added new source files to the protoc target in protobuf.gyp. BUG=none TEST=sync_unit_tests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=80180

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+13921 lines, -3511 lines) Patch
M third_party/protobuf/README.chromium View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/protobuf.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/protobuf/python/README.txt View 2 chunks +24 lines, -0 lines 0 comments Download
M third_party/protobuf/python/ez_setup.py View 5 chunks +14 lines, -12 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/descriptor.py View 4 chunks +18 lines, -10 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/internal/api_implementation.py View 1 chunk +64 lines, -0 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/containers.py View 2 chunks +21 lines, -6 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/internal/cpp_message.py View 1 chunk +616 lines, -0 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/decoder.py View 3 chunks +75 lines, -2 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/encoder.py View 3 chunks +85 lines, -2 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/generator_test.py View 4 chunks +28 lines, -4 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/message_test.py View 5 chunks +254 lines, -0 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/internal/python_message.py View 1 chunk +1098 lines, -0 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/reflection_test.py View 26 chunks +186 lines, -40 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/internal/text_format_test.py View 8 chunks +156 lines, -13 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/message.py View 3 chunks +14 lines, -0 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/pyext/python-proto2.cc View 1 chunk +1658 lines, -0 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/pyext/python_descriptor.h View 1 chunk +87 lines, -0 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/pyext/python_descriptor.cc View 1 chunk +334 lines, -0 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/pyext/python_protobuf.h View 1 chunk +57 lines, -0 lines 0 comments Download
A third_party/protobuf/python/google/protobuf/pyext/python_protobuf.cc View 1 chunk +63 lines, -0 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/reflection.py View 4 chunks +17 lines, -1035 lines 0 comments Download
M third_party/protobuf/python/google/protobuf/text_format.py View 13 chunks +56 lines, -38 lines 0 comments Download
M third_party/protobuf/python/setup.py View 4 chunks +30 lines, -3 lines 0 comments Download
M third_party/protobuf/src/Makefile.am View 4 chunks +5 lines, -4 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/code_generator.h View 4 chunks +17 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/code_generator.cc View 1 chunk +8 lines, -3 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/command_line_interface.h View 3 chunks +4 lines, -4 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc View 23 chunks +47 lines, -39 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc View 10 chunks +62 lines, -11 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc View 3 chunks +16 lines, -16 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.cc View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_file.cc View 2 chunks +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_generator.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_generator.cc View 3 chunks +3 lines, -3 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.h View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_helpers.cc View 2 chunks +7 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message.cc View 11 chunks +214 lines, -51 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message_field.cc View 2 chunks +9 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc View 1 chunk +11 lines, -11 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc View 6 chunks +36 lines, -25 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto View 1 chunk +4 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_unittest.cc View 6 chunks +60 lines, -9 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/importer.cc View 1 chunk +6 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_enum.cc View 2 chunks +9 lines, -11 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.h View 1 chunk +22 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.cc View 10 chunks +229 lines, -65 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_extension.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_extension.cc View 1 chunk +95 lines, -80 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_field.h View 2 chunks +11 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_field.cc View 2 chunks +35 lines, -10 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_file.h View 3 chunks +4 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_file.cc View 7 chunks +30 lines, -30 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_generator.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_generator.cc View 4 chunks +17 lines, -11 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_helpers.h View 5 chunks +52 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_helpers.cc View 2 chunks +140 lines, -3 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_message.h View 2 chunks +12 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_message.cc View 16 chunks +389 lines, -89 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.h View 1 chunk +36 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.cc View 6 chunks +665 lines, -116 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_plugin_unittest.cc View 1 chunk +10 lines, -9 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.h View 1 chunk +22 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc View 8 chunks +324 lines, -70 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/java/java_service.cc View 1 chunk +1 line, -1 line 0 comments Download
A third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.h View 1 chunk +120 lines, -0 lines 0 comments Download
A third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc View 1 chunk +605 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/mock_code_generator.h View 3 chunks +7 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/mock_code_generator.cc View 10 chunks +37 lines, -15 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/parser.h View 6 chunks +132 lines, -36 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/parser.cc View 27 chunks +517 lines, -175 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/parser_unittest.cc View 5 chunks +866 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/plugin.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/plugin.cc View 3 chunks +23 lines, -12 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/plugin.proto View 1 chunk +1 line, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/plugin.pb.h View 12 chunks +168 lines, -104 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc View 25 chunks +35 lines, -40 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/python/python_generator.h View 2 chunks +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/python/python_generator.cc View 6 chunks +20 lines, -6 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/python/python_plugin_unittest.cc View 1 chunk +7 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/subprocess.h View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/subprocess.cc View 2 chunks +2 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/zip_output_unittest.sh View 1 chunk +21 lines, -15 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/zip_writer.h View 2 chunks +32 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc View 2 chunks +32 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor.cc View 7 chunks +98 lines, -9 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor.proto View 4 chunks +107 lines, -7 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor.pb.h View 58 chunks +1465 lines, -588 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor.pb.cc View 161 chunks +1044 lines, -363 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor_database.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/descriptor_unittest.cc View 4 chunks +85 lines, -17 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/extension_set.h View 3 chunks +3 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/extension_set.cc View 1 chunk +12 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/generated_message_reflection.cc View 2 chunks +0 lines, -3 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/generated_message_util.h View 2 chunks +7 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/generated_message_util.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/coded_stream.h View 4 chunks +5 lines, -5 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/coded_stream.cc View 2 chunks +10 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/io/coded_stream_unittest.cc View 2 chunks +28 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/gzip_stream.cc View 4 chunks +28 lines, -13 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/printer.h View 1 chunk +5 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/io/printer.cc View 1 chunk +11 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/tokenizer.h View 3 chunks +10 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/tokenizer.cc View 5 chunks +5 lines, -2 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc View 7 chunks +59 lines, -36 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc View 7 chunks +135 lines, -6 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/message.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/repeated_field.h View 22 chunks +67 lines, -20 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/repeated_field.cc View 2 chunks +4 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/repeated_field_unittest.cc View 4 chunks +101 lines, -1 line 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/common.h View 9 chunks +43 lines, -11 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/common.cc View 2 chunks +12 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/stubs/hash.cc View 1 chunk +0 lines, -41 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/text_format.h View 7 chunks +34 lines, -13 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/text_format.cc View 21 chunks +79 lines, -35 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/text_format_unittest.cc View 8 chunks +77 lines, -10 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/unittest.proto View 3 chunks +18 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/unittest_custom_options.proto View 2 chunks +91 lines, -0 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto View 1 chunk +1 line, -3 lines 0 comments Download
M third_party/protobuf/src/google/protobuf/wire_format_lite_inl.h View 6 chunks +61 lines, -34 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
agl
9 years, 8 months ago (2011-03-31 16:52:06 UTC) #1
Ilya Sherman
LGTM with green trybot runs (including the sync trybots, I s'pose, since this is mostly ...
9 years, 8 months ago (2011-03-31 21:23:15 UTC) #2
agl
9 years, 8 months ago (2011-04-02 13:42:10 UTC) #3 
On Thu, Mar 31, 2011 at 5:23 PM,  <isherman@chromium.org> wrote:
> http://codereview.chromium.org/6737030/

This has been landed now.


AGL

Powered by Google App Engine
This is Rietveld 408576698