diff -Nru golang-gitaly-proto-0.118.1+dfsg/debian/changelog golang-gitaly-proto-0.123.0+dfsg/debian/changelog --- golang-gitaly-proto-0.118.1+dfsg/debian/changelog 2018-12-09 10:57:49.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/debian/changelog 2018-12-15 09:35:04.000000000 +0000 @@ -1,3 +1,16 @@ +golang-gitaly-proto (0.123.0+dfsg-2) unstable; urgency=medium + + * Reupload to unstable + + -- Pirate Praveen Sat, 15 Dec 2018 15:05:04 +0530 + +golang-gitaly-proto (0.123.0+dfsg-1) experimental; urgency=medium + + * New upstream version 0.123.0+dfsg + * Workaround the build failure in golang build + + -- Pirate Praveen Wed, 12 Dec 2018 23:31:38 +0530 + golang-gitaly-proto (0.118.1+dfsg-2) unstable; urgency=medium * Reupload to unstable diff -Nru golang-gitaly-proto-0.118.1+dfsg/debian/golang-gitaly-proto-dev.install golang-gitaly-proto-0.123.0+dfsg/debian/golang-gitaly-proto-dev.install --- golang-gitaly-proto-0.118.1+dfsg/debian/golang-gitaly-proto-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/debian/golang-gitaly-proto-dev.install 2018-12-15 09:33:22.000000000 +0000 @@ -0,0 +1 @@ +go usr/share/gocode/src/gitlab.com/gitlab-org/gitaly-proto/ diff -Nru golang-gitaly-proto-0.118.1+dfsg/debian/patches/remove-git-in-gemspec.patch golang-gitaly-proto-0.123.0+dfsg/debian/patches/remove-git-in-gemspec.patch --- golang-gitaly-proto-0.118.1+dfsg/debian/patches/remove-git-in-gemspec.patch 2018-12-09 10:57:49.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/debian/patches/remove-git-in-gemspec.patch 2018-12-15 09:33:22.000000000 +0000 @@ -10,4 +10,4 @@ + spec.files = Dir.glob('ruby/lib/**/*.rb') spec.require_paths = ["#{prefix}/lib"] - spec.add_dependency "google-protobuf", "~> 3.1" + spec.add_dependency "grpc", "~> 1.0" diff -Nru golang-gitaly-proto-0.118.1+dfsg/debian/rules golang-gitaly-proto-0.123.0+dfsg/debian/rules --- golang-gitaly-proto-0.118.1+dfsg/debian/rules 2018-12-09 10:57:49.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/debian/rules 2018-12-15 09:33:22.000000000 +0000 @@ -6,20 +6,31 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies %: + # Skip building golang temporarily https://gitlab.com/gitlab-org/gitaly/issues/1427 (using embedded copy in gitaly) dh $@ --buildsystem=golang --with=golang --package=golang-gitaly-proto-dev dh $@ --buildsystem=ruby --with=ruby --package=ruby-gitaly override_dh_auto_configure: + mkdir -p go/gitalypb _support/generate-from-proto - dh_auto_configure -O--buildsystem=golang -O--package=golang-gitaly-proto-dev + #dh_auto_configure -O--buildsystem=golang -O--package=golang-gitaly-proto-dev dh_auto_configure -O--buildsystem=ruby -O--package=ruby-gitaly +override_dh_auto_build: + dh_auto_build -O--buildsystem=ruby -O--package=ruby-gitaly + +override_dh_auto_test: + dh_auto_test -O--buildsystem=ruby -O--package=ruby-gitaly + override_dh_auto_install: - dh_auto_install -O--buildsystem=golang -O--package=golang-gitaly-proto-dev --destdir=debian/golang-gitaly-proto-dev + #dh_auto_install -O--buildsystem=golang -O--package=golang-gitaly-proto-dev --destdir=debian/golang-gitaly-proto-dev dh_auto_install -O--buildsystem=ruby -O--package=ruby-gitaly --destdir=debian/ruby-gitaly +override_dh_golang: + override_dh_auto_clean: rm -rf go/*.pb.go rm -rf ruby/lib/gitaly/*_pb.rb + rm -rf go/gitalypb dh_auto_clean -O--buildsystem=golang -O--package=golang-gitaly-proto-dev dh_auto_clean -O--buildsystem=ruby diff -Nru golang-gitaly-proto-0.118.1+dfsg/deprecated-services.proto golang-gitaly-proto-0.123.0+dfsg/deprecated-services.proto --- golang-gitaly-proto-0.118.1+dfsg/deprecated-services.proto 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/deprecated-services.proto 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -syntax = "proto3"; - -package gitaly; - -import "commit.proto"; -import "diff.proto"; -import "notifications.proto"; -import "ref.proto"; -import "smarthttp.proto"; -import "ssh.proto"; - -// TODO: remove all these legacy RPC interfaces when client references to them are removed. - -// Deprecated -service Commit { - rpc CommitIsAncestor(CommitIsAncestorRequest) returns (CommitIsAncestorResponse) { } - rpc TreeEntry(TreeEntryRequest) returns (stream TreeEntryResponse) { }; -} - -// Deprecated -service Diff { - // Returns stream of CommitDiffResponse with patches chunked over messages - rpc CommitDiff(CommitDiffRequest) returns (stream CommitDiffResponse) { }; - - // Return a stream so we can divide the response in chunks of deltas - rpc CommitDelta(CommitDeltaRequest) returns (stream CommitDeltaResponse) { }; -} - -// Deprecated -service Notifications { - rpc PostReceive(PostReceiveRequest) returns (PostReceiveResponse) { } -} - -// Deprecated -service Ref { - rpc FindDefaultBranchName(FindDefaultBranchNameRequest) returns (FindDefaultBranchNameResponse) { } - rpc FindAllBranchNames(FindAllBranchNamesRequest) returns (stream FindAllBranchNamesResponse) { } - rpc FindAllTagNames(FindAllTagNamesRequest) returns (stream FindAllTagNamesResponse) { } - // Find a Ref matching the given constraints. Response may be empty. - rpc FindRefName(FindRefNameRequest) returns (FindRefNameResponse) { } - // Return a stream so we can divide the response in chunks of branches - rpc FindLocalBranches(FindLocalBranchesRequest) returns (stream FindLocalBranchesResponse) { } -} - -// DEPRECATED -service SmartHTTP { - // The response body for GET /info/refs?service=git-upload-pack - rpc InfoRefsUploadPack(InfoRefsRequest) returns (stream InfoRefsResponse) { } - - // The response body for GET /info/refs?service=git-receive-pack - rpc InfoRefsReceivePack(InfoRefsRequest) returns (stream InfoRefsResponse) { } - - // Request and response body for POST /upload-pack - rpc PostUploadPack(stream PostUploadPackRequest) returns (stream PostUploadPackResponse) { } - - // Request and response body for POST /receive-pack - rpc PostReceivePack(stream PostReceivePackRequest) returns (stream PostReceivePackResponse) { } -} - -// DEPRECATED -service SSH { - // To forward 'git upload-pack' to Gitaly for SSH sessions - rpc SSHUploadPack(stream SSHUploadPackRequest) returns (stream SSHUploadPackResponse) { } - - // To forward 'git receive-pack' to Gitaly for SSH sessions - rpc SSHReceivePack(stream SSHReceivePackRequest) returns (stream SSHReceivePackResponse) { } -} diff -Nru golang-gitaly-proto-0.118.1+dfsg/diff.proto golang-gitaly-proto-0.123.0+dfsg/diff.proto --- golang-gitaly-proto-0.118.1+dfsg/diff.proto 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/diff.proto 2018-12-08 15:03:35.000000000 +0000 @@ -23,15 +23,20 @@ repeated bytes paths = 5; bool collapse_diffs = 6; bool enforce_limits = 7; + + // These limits are only enforced when enforce_limits == true. int32 max_files = 8; int32 max_lines = 9; int32 max_bytes = 10; - int32 safe_max_files = 11; - int32 safe_max_lines = 12; - int32 safe_max_bytes = 13; // Limitation of a single diff patch, // patches surpassing this limit are pruned by default. + // If this is 0 you will get back empty patches. int32 max_patch_bytes = 14; + + // These limits are only enforced if collapse_diffs == true. + int32 safe_max_files = 11; + int32 safe_max_lines = 12; + int32 safe_max_bytes = 13; } // A CommitDiffResponse corresponds to a single changed file in a commit. diff -Nru golang-gitaly-proto-0.118.1+dfsg/gitaly-proto.gemspec golang-gitaly-proto-0.123.0+dfsg/gitaly-proto.gemspec --- golang-gitaly-proto-0.118.1+dfsg/gitaly-proto.gemspec 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/gitaly-proto.gemspec 2018-12-08 15:03:35.000000000 +0000 @@ -18,6 +18,5 @@ spec.files = `git ls-files -z #{prefix}`.split("\x0").reject { |f| f.match(%r{^#{prefix}/(test|spec|features)/}) } spec.require_paths = ["#{prefix}/lib"] - spec.add_dependency "google-protobuf", "~> 3.1" - spec.add_dependency "grpc", "~> 1.10" + spec.add_dependency "grpc", "~> 1.0" end diff -Nru golang-gitaly-proto-0.118.1+dfsg/go/VERSION golang-gitaly-proto-0.123.0+dfsg/go/VERSION --- golang-gitaly-proto-0.118.1+dfsg/go/VERSION 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/go/VERSION 2018-12-08 15:03:35.000000000 +0000 @@ -1 +1 @@ -0.118.1 +0.123.0 diff -Nru golang-gitaly-proto-0.118.1+dfsg/operations.proto golang-gitaly-proto-0.123.0+dfsg/operations.proto --- golang-gitaly-proto-0.118.1+dfsg/operations.proto 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/operations.proto 2018-12-08 15:03:35.000000000 +0000 @@ -17,6 +17,8 @@ rpc UserCommitFiles(stream UserCommitFilesRequest) returns (UserCommitFilesResponse) {} rpc UserRebase(UserRebaseRequest) returns (UserRebaseResponse) {} rpc UserSquash(UserSquashRequest) returns (UserSquashResponse) {} + rpc UserApplyPatch(stream UserApplyPatchRequest) returns (UserApplyPatchResponse) {} + rpc UserUpdateSubmodule(UserUpdateSubmoduleRequest) returns (UserUpdateSubmoduleResponse) {} } message UserCreateBranchRequest { @@ -242,3 +244,38 @@ reserved "pre_receive_error"; string git_error = 3; } + +message UserApplyPatchRequest { + message Header { + Repository repository = 1; + User user = 2; + bytes target_branch = 3; + } + + oneof user_apply_patch_request_payload { + Header header = 1; + bytes patches = 2; + } +} + +message UserApplyPatchResponse { + OperationBranchUpdate branch_update = 1; +} + +message UserUpdateSubmoduleRequest { + Repository repository = 1; + User user = 2; + string commit_sha = 3; + bytes branch = 4; + bytes submodule = 5; + bytes commit_message = 6; +} + +message UserUpdateSubmoduleResponse { + OperationBranchUpdate branch_update = 1; + string pre_receive_error = 2; + // DEPRECATED: https://gitlab.com/gitlab-org/gitaly-proto/merge_requests/237 + reserved 3; + reserved "create_tree_error"; + string commit_error = 4; +} diff -Nru golang-gitaly-proto-0.118.1+dfsg/remote.proto golang-gitaly-proto-0.123.0+dfsg/remote.proto --- golang-gitaly-proto-0.118.1+dfsg/remote.proto 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/remote.proto 2018-12-08 15:03:35.000000000 +0000 @@ -48,6 +48,8 @@ Repository repository = 1; string ref_name = 2; repeated bytes only_branches_matching = 3; + string ssh_key = 4; + string known_hosts = 5; } message UpdateRemoteMirrorResponse {} diff -Nru golang-gitaly-proto-0.118.1+dfsg/ruby/lib/gitaly/version.rb golang-gitaly-proto-0.123.0+dfsg/ruby/lib/gitaly/version.rb --- golang-gitaly-proto-0.118.1+dfsg/ruby/lib/gitaly/version.rb 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/ruby/lib/gitaly/version.rb 2018-12-08 15:03:35.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was auto-generated by _support/release +# This file was auto-generated by /Users/jacobvosmaer/Desktop/gitlab-development-kit/gitaly/src/gitlab.com/gitlab-org/gitaly-proto/_support/release module Gitaly - VERSION = "0.118.1" + VERSION = "0.123.0" end diff -Nru golang-gitaly-proto-0.118.1+dfsg/ruby/lib/gitaly.rb golang-gitaly-proto-0.123.0+dfsg/ruby/lib/gitaly.rb --- golang-gitaly-proto-0.118.1+dfsg/ruby/lib/gitaly.rb 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/ruby/lib/gitaly.rb 2018-12-08 15:03:35.000000000 +0000 @@ -9,8 +9,6 @@ require 'gitaly/conflicts_services_pb' -require 'gitaly/deprecated-services_services_pb' - require 'gitaly/diff_services_pb' require 'gitaly/namespace_services_pb' diff -Nru golang-gitaly-proto-0.118.1+dfsg/shared.proto golang-gitaly-proto-0.123.0+dfsg/shared.proto --- golang-gitaly-proto-0.118.1+dfsg/shared.proto 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/shared.proto 2018-12-08 15:03:35.000000000 +0000 @@ -4,6 +4,8 @@ import "google/protobuf/timestamp.proto"; +option go_package = "gitalypb"; + message Repository { // DEPRECATED: https://gitlab.com/gitlab-org/gitaly/issues/151 reserved 1; diff -Nru golang-gitaly-proto-0.118.1+dfsg/_support/Gemfile golang-gitaly-proto-0.123.0+dfsg/_support/Gemfile --- golang-gitaly-proto-0.118.1+dfsg/_support/Gemfile 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/_support/Gemfile 2018-12-08 15:03:35.000000000 +0000 @@ -1,4 +1,3 @@ source 'https://rubygems.org' -gem 'grpc', '~> 1.10' gem 'grpc-tools' diff -Nru golang-gitaly-proto-0.118.1+dfsg/_support/Gemfile.lock golang-gitaly-proto-0.123.0+dfsg/_support/Gemfile.lock --- golang-gitaly-proto-0.118.1+dfsg/_support/Gemfile.lock 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/_support/Gemfile.lock 2018-12-08 15:03:35.000000000 +0000 @@ -1,48 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - faraday (0.14.0) - multipart-post (>= 1.2, < 3) - google-protobuf (3.5.1.2) - googleapis-common-protos-types (1.0.1) - google-protobuf (~> 3.0) - googleauth (0.6.2) - faraday (~> 0.12) - jwt (>= 1.4, < 3.0) - logging (~> 2.0) - memoist (~> 0.12) - multi_json (~> 1.11) - os (~> 0.9) - signet (~> 0.7) - grpc (1.10.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) - googleauth (>= 0.5.1, < 0.7) grpc-tools (1.0.1) - jwt (2.1.0) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - memoist (0.16.0) - multi_json (1.13.1) - multipart-post (2.0.0) - os (0.9.6) - public_suffix (3.0.2) - signet (0.8.1) - addressable (~> 2.3) - faraday (~> 0.9) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) PLATFORMS ruby DEPENDENCIES - grpc (~> 1.10) grpc-tools BUNDLED WITH - 1.16.1 + 1.16.2 diff -Nru golang-gitaly-proto-0.118.1+dfsg/_support/generate-from-proto golang-gitaly-proto-0.123.0+dfsg/_support/generate-from-proto --- golang-gitaly-proto-0.118.1+dfsg/_support/generate-from-proto 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/_support/generate-from-proto 2018-12-08 15:03:35.000000000 +0000 @@ -19,7 +19,7 @@ def main FileUtils.rm(Dir['go/**/*.pb.go']) - run!(%W[protoc -I #{PROTO_INCLUDE}] + PROTO_FILES + %w[--go_out=plugins=grpc:go]) + run!(%W[protoc -I #{PROTO_INCLUDE}] + PROTO_FILES + %w[--go_out=plugins=grpc:go/gitalypb]) FileUtils.rm(Dir[File.join(RUBY_PREFIX, '**/*_pb.rb')]) ruby_lib_gitaly = File.join(RUBY_PREFIX, 'gitaly') diff -Nru golang-gitaly-proto-0.118.1+dfsg/VERSION golang-gitaly-proto-0.123.0+dfsg/VERSION --- golang-gitaly-proto-0.118.1+dfsg/VERSION 2018-09-12 14:37:39.000000000 +0000 +++ golang-gitaly-proto-0.123.0+dfsg/VERSION 2018-12-08 15:03:35.000000000 +0000 @@ -1 +1 @@ -0.118.1 +0.123.0