aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Get Python 2.6 working.Dan O'Reilly2015-08-1417-69/+104
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Fix usage of assertItemsEqual on Py3Dan O'Reilly2015-08-141-2/+2
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Fix some more Python 3 compat issuesDan O'Reilly2015-08-143-14/+25
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Fixing some long/int bugsDan O'Reilly2015-08-144-12/+21
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1411-125/+470
|\
| * Merge pull request #716 from haberman/fixrubyJoshua Haberman2015-08-133-123/+141
| |\ | | | | | | Fixed several Ruby conformance test cases through upb update.
| | * Fixed several Ruby conformance test cases through upb update.Josh Haberman2015-08-123-123/+141
| | | | | | | | | | | | Change-Id: Ief77de7134e05e07b1a7e3970d49880c2d5e6fe9
| * | Merge pull request #718 from jskeet/descriptor-descriptorJan Tattermusch2015-08-133-2/+27
| |\ \ | | | | | | | | Allow public access to descriptor.proto as a dependency.
| | * | Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-133-2/+27
| |/ / | | | | | | | | | | | | With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed. Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.
| * | Merge pull request #673 from podsvirov/topic-cmake-installFeng Xiao2015-08-125-0/+302
| |\ \ | | |/ | |/| Install protobuf from cmake project
| | * Install headers from extract_includes for all platformsKonstantin Podsvirov2015-08-041-1/+1
| | |
| | * Fix: comment typoKonstantin Podsvirov2015-08-031-1/+1
| | |
| | * Install well-known type proto files from CMake projectKonstantin Podsvirov2015-08-032-3/+57
| | |
| | * CMake installation now compatible with origin FindProtobuf moduleKonstantin Podsvirov2015-08-023-2/+156
| | |
| | * Parsing version from configure.ac for CMake projectKonstantin Podsvirov2015-08-012-15/+24
| | |
| | * Install protobuf from cmake projectKonstantin Podsvirov2015-07-314-0/+85
| | | | | | | | | | | | | | | Additional export as "protobuf" package for importing from other cmake projects
* | | Build protobuf files in as part of tox runs.Dan O'Reilly2015-08-131-0/+1
| | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | | Fixing some testsDan O'Reilly2015-08-134-42/+30
| | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-12930-21697/+246414
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb
| * | Merge pull request #702 from jtattermusch/visual_studio_build_static_runtimeFeng Xiao2015-08-121-0/+13
| |\ \ | | | | | | | | Link runtime statically for VS build
| | * | only link runtime libraries statically for a static buildJan Tattermusch2015-08-121-12/+13
| | | |
| | * | make VS build link runtime staticallyJan Tattermusch2015-08-081-0/+12
| | | |
| * | | Merge pull request #706 from thomasvl/revert_any_change_2Paul Yang2015-08-113-121/+1
| |\ \ \ | | | | | | | | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
| | * | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any."Thomas Van Lenten2015-08-113-121/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit 7366efd81e7f36108aa35e66fca61da8a65762c2. Still some discussion about the api to expose the helpers with.
| * | | Merge pull request #649 from cijianzy/masterPaul Yang2015-08-111-1/+1
| |\ \ \ | | | | | | | | | | Update GPBWellKnownTypes.m
| | * | | Update GPBWellKnownTypes.mYue Zhang2015-07-291-1/+1
| | | | | | | | | | | | | | | fix an bug(forgive my english..)
| * | | | Merge pull request #703 from jskeet/more-todosJan Tattermusch2015-08-107-126/+168
| |\ \ \ \ | | | | | | | | | | | | More TODOs done.
| | * | | | More TODOs done.Jon Skeet2015-08-107-126/+168
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | - Removed a TODO without change in DescriptorPool.LookupSymbol - the TODOs were around performance, and this is only used during descriptor initialization - Make the CodedInputStream limits read-only, adding a static factory method for the rare cases when this is useful - Extracted IDeepCloneable into its own file.
| * | | | Merge pull request #701 from jskeet/map-viewsJon Skeet2015-08-102-4/+180
| |\ \ \ \ | | | | | | | | | | | | Implement Keys and Values as views in MapField
| | * | | | Fix parameter name in exception.Jon Skeet2015-08-101-1/+1
| | | | | |
| | * | | | Implement ICollection.CopyTo (using Array) for MapField views.Jon Skeet2015-08-102-1/+26
| | | | | |
| | * | | | Implement Keys and Values as viewsJon Skeet2015-08-082-4/+155
| | | |/ / | | |/| |
| * | | | Merge pull request #699 from jskeet/validate_packedJon Skeet2015-08-103-4/+18
| |\ \ \ \ | | | | | | | | | | | | Make FieldDescriptor.IsPacked work appropriately.
| | * | | | Make FieldDescriptor.IsPacked work appropriately.Jon Skeet2015-08-083-4/+18
| | |/ / / | | | | | | | | | | | | | | | | | | | | This is a bit of a grotty hack, as we need to sort of fake proto2 field presence, but with only a proto3 version of the descriptor messages (a bit like oneof detection). Should be okay, but will need to be careful of this if we ever implement proto2.
| * | | | Merge pull request #700 from jskeet/remove-packed-hackJan Tattermusch2015-08-082-12/+1
| |\ \ \ \ | | |/ / / | |/| | | Remove our own version of MakeTag now that the main one is fixed.
| | * | | Remove our own version of MakeTag now that the main one is fixed.Jon Skeet2015-08-072-12/+1
| | | | | | | | | | | | | | | | | | | | "Tested" by regenerating code and observing that there are no changes.
| * | | | Merge pull request #695 from jskeet/remove-todosJon Skeet2015-08-0817-103/+83
| |\ \ \ \ | | | | | | | | | | | | Tidying up
| | * | | | Address review comments.Jon Skeet2015-08-081-2/+0
| | | | | |
| | * | | | Remove reference to generic types within XML comment.Jon Skeet2015-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Visual Studio is happy with it, but Mono isn't :(
| | * | | | Tidying up - fix a bunch of TODOs and remove outdated ones.Jon Skeet2015-08-0817-102/+84
| |/ / / /
| * | | | Merge pull request #694 from jskeet/groupsJon Skeet2015-08-0829-488/+303
| |\ \ \ \ | | |/ / / | |/| | | Fix groups handling in C#
| | * | | Address review comments.Jon Skeet2015-08-082-2/+24
| | | | |
| | * | | Generated code for previous commit.Jon Skeet2015-08-0621-452/+142
| | | | |
| | * | | Skip groups properly.Jon Skeet2015-08-067-36/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time. Currently it will ignore extraneous end group tags, which may or may not be a good thing. Renamed ConsumeLastField to SkipLastField as it felt more natural. Removed WireFormat.IsEndGroupTag as it's no longer useful. This mostly fixes issue 688. (Generated code changes coming in next commit.)
| * | | | Merge pull request #645 from zsurocking/masterPaul Yang2015-08-0635-104/+225
| |\ \ \ \ | | | | | | | | | | | | Down integrate. Generate a package name suffix ".nano" for nano messages
| | * \ \ \ Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-04411-255904/+34404
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-08-040-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-07-290-0/+0
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-08-0420-28/+28
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / /
| | | * | | / / Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-275-58/+174
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 22:12:06 +0000