Vendor gitlab_git at f7537ce03a29b

5 files changed, 118 insertions, 35 deletions

diff --git a/ruby/vendor/gitlab_git/REVISION b/ruby/vendor/gitlab_git/REVISION
index b8b33bb61..32820efd3 100644
--- a/ruby/vendor/gitlab_git/REVISION
+++ b/ruby/vendor/gitlab_git/REVISION
@@ -1 +1 @@
-6f045671e665e42c7f354541e6804dda3c03438f
+f7537ce03a29b1af85461b2883c33bb41b2382d5
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb b/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb
index ab94ba8a7..e36d54104 100644
--- a/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb
+++ b/ruby/vendor/gitlab_git/lib/gitlab/git/operation_service.rb
@@ -72,7 +72,7 @@ module Gitlab
 
       # Whenever `start_branch_name` is passed, if `branch_name` doesn't exist,
       # it would be created from `start_branch_name`.
-      # If `start_project` is passed, and the branch doesn't exist,
+      # If `start_repository` is passed, and the branch doesn't exist,
       # it would try to find the commits from it instead of current repository.
       def with_branch(
         branch_name,
@@ -80,15 +80,13 @@ module Gitlab
         start_repository: repository,
         &block)
 
-        # Refactoring aid
-        unless start_repository.is_a?(Gitlab::Git::Repository)
-          raise "expected a Gitlab::Git::Repository, got #{start_repository}"
-        end
+        Gitlab::Git.check_namespace!(start_repository)
+        start_repository = RemoteRepository.new(start_repository) unless start_repository.is_a?(RemoteRepository)
 
         start_branch_name = nil if start_repository.empty_repo?
 
         if start_branch_name && !start_repository.branch_exists?(start_branch_name)
-          raise ArgumentError, "Cannot find branch #{start_branch_name} in #{start_repository.full_path}"
+          raise ArgumentError, "Cannot find branch #{start_branch_name} in #{start_repository.relative_path}"
         end
 
         update_branch_with_hooks(branch_name) do
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb b/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb
new file mode 100644
index 000000000..3685aa206
--- /dev/null
+++ b/ruby/vendor/gitlab_git/lib/gitlab/git/remote_repository.rb
@@ -0,0 +1,82 @@
+module Gitlab
+  module Git
+    #
+    # When a Gitaly call involves two repositories instead of one we cannot
+    # assume that both repositories are on the same Gitaly server. In this
+    # case we need to make a distinction between the repository that the
+    # call is being made on (a Repository instance), and the "other"
+    # repository (a RemoteRepository instance). This is the reason why we
+    # have the RemoteRepository class in Gitlab::Git.
+    #
+    # When you make changes, be aware that gitaly-ruby sub-classes this
+    # class.
+    #
+    class RemoteRepository
+      attr_reader :path, :relative_path, :gitaly_repository
+
+      def initialize(repository)
+        @relative_path = repository.relative_path
+        @gitaly_repository = repository.gitaly_repository
+
+        # These instance variables will not be available in gitaly-ruby, where
+        # we have no disk access to this repository.
+        @repository = repository
+        @path = repository.path
+      end
+
+      def empty_repo?
+        # We will override this implementation in gitaly-ruby because we cannot
+        # use '@repository' there.
+        @repository.empty_repo?
+      end
+
+      def commit_id(revision)
+        # We will override this implementation in gitaly-ruby because we cannot
+        # use '@repository' there.
+        @repository.commit(revision)&.sha
+      end
+
+      def branch_exists?(name)
+        # We will override this implementation in gitaly-ruby because we cannot
+        # use '@repository' there.
+        @repository.branch_exists?(name)
+      end
+
+      # Compares self to a Gitlab::Git::Repository. This implementation uses
+      # 'self.gitaly_repository' so that it will also work in the
+      # GitalyRemoteRepository subclass defined in gitaly-ruby.
+      def same_repository?(other_repository)
+        gitaly_repository.storage_name == other_repository.storage &&
+          gitaly_repository.relative_path == other_repository.relative_path
+      end
+
+      def fetch_env
+        gitaly_ssh = File.absolute_path(File.join(Gitlab.config.gitaly.client_path, 'gitaly-ssh'))
+        gitaly_address = gitaly_client.address(storage)
+        gitaly_token = gitaly_client.token(storage)
+
+        request = Gitaly::SSHUploadPackRequest.new(repository: gitaly_repository)
+        env = {
+          'GITALY_ADDRESS' => gitaly_address,
+          'GITALY_PAYLOAD' => request.to_json,
+          'GITALY_WD' => Dir.pwd,
+          'GIT_SSH_COMMAND' => "#{gitaly_ssh} upload-pack"
+        }
+        env['GITALY_TOKEN'] = gitaly_token if gitaly_token.present?
+
+        env
+      end
+
+      private
+
+      # Must return an object that responds to 'address' and 'storage'.
+      def gitaly_client
+        Gitlab::GitalyClient
+      end
+
+      def storage
+        gitaly_repository.storage_name
+      end
+    end
+  end
+end
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb b/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb
index d236e1b03..14a8d5515 100644
--- a/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb
+++ b/ruby/vendor/gitlab_git/lib/gitlab/git/repository.rb
@@ -58,7 +58,7 @@ module Gitlab
       # Rugged repo object
       attr_reader :rugged
 
-      attr_reader :storage, :gl_repository, :relative_path, :gitaly_resolver
+      attr_reader :storage, :gl_repository, :relative_path
 
       # This initializer method is only used on the client side (gitlab-ce).
       # Gitaly-ruby uses a different initializer.
@@ -66,7 +66,6 @@ module Gitlab
         @storage = storage
         @relative_path = relative_path
         @gl_repository = gl_repository
-        @gitaly_resolver = Gitlab::GitalyClient
 
         storage_path = Gitlab.config.repositories.storages[@storage]['path']
         @path = File.join(storage_path, @relative_path)
@@ -1014,23 +1013,22 @@ module Gitlab
 
       def with_repo_branch_commit(start_repository, start_branch_name)
         Gitlab::Git.check_namespace!(start_repository)
+        start_repository = RemoteRepository.new(start_repository) unless start_repository.is_a?(RemoteRepository)
 
         return yield nil if start_repository.empty_repo?
 
-        if start_repository == self
+        if start_repository.same_repository?(self)
           yield commit(start_branch_name)
         else
-          start_commit = start_repository.commit(start_branch_name)
+          start_commit_id = start_repository.commit_id(start_branch_name)
 
-          return yield nil unless start_commit
+          return yield nil unless start_commit_id
 
-          sha = start_commit.sha
-
-          if branch_commit = commit(sha)
+          if branch_commit = commit(start_commit_id)
             yield branch_commit
           else
             with_repo_tmp_commit(
-              start_repository, start_branch_name, sha) do |tmp_commit|
+              start_repository, start_branch_name, start_commit_id) do |tmp_commit|
               yield tmp_commit
             end
           end
@@ -1087,6 +1085,9 @@ module Gitlab
       end
 
       def fetch_ref(source_repository, source_ref:, target_ref:)
+        Gitlab::Git.check_namespace!(source_repository)
+        source_repository = RemoteRepository.new(source_repository) unless source_repository.is_a?(RemoteRepository)
+
         message, status = GitalyClient.migrate(:fetch_ref) do |is_enabled|
           if is_enabled
             gitaly_fetch_ref(source_repository, source_ref: source_ref, target_ref: target_ref)
@@ -1620,22 +1621,9 @@ module Gitlab
       end
 
       def gitaly_fetch_ref(source_repository, source_ref:, target_ref:)
-        gitaly_ssh = File.absolute_path(File.join(Gitlab.config.gitaly.client_path, 'gitaly-ssh'))
-        gitaly_address = gitaly_resolver.address(source_repository.storage)
-        gitaly_token = gitaly_resolver.token(source_repository.storage)
-
-        request = Gitaly::SSHUploadPackRequest.new(repository: source_repository.gitaly_repository)
-        env = {
-          'GITALY_ADDRESS' => gitaly_address,
-          'GITALY_PAYLOAD' => request.to_json,
-          'GITALY_WD' => Dir.pwd,
-          'GIT_SSH_COMMAND' => "#{gitaly_ssh} upload-pack"
-        }
-        env['GITALY_TOKEN'] = gitaly_token if gitaly_token.present?
-
         args = %W(fetch --no-tags -f ssh://gitaly/internal.git #{source_ref}:#{target_ref})
 
-        run_git(args, env: env)
+        run_git(args, env: source_repository.fetch_env)
       end
 
       def gitaly_ff_merge(user, source_sha, target_branch)
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/wiki.rb b/ruby/vendor/gitlab_git/lib/gitlab/git/wiki.rb
index fe901d049..5d36f16ab 100644
--- a/ruby/vendor/gitlab_git/lib/gitlab/git/wiki.rb
+++ b/ruby/vendor/gitlab_git/lib/gitlab/git/wiki.rb
@@ -48,11 +48,14 @@ module Gitlab
       end
 
       def update_page(page_path, title, format, content, commit_details)
-        assert_type!(format, Symbol)
-        assert_type!(commit_details, CommitDetails)
-
-        gollum_wiki.update_page(gollum_page_by_path(page_path), title, format, content, commit_details.to_h)
-        nil
+        @repository.gitaly_migrate(:wiki_update_page) do |is_enabled|
+          if is_enabled
+            gitaly_update_page(page_path, title, format, content, commit_details)
+            gollum_wiki.clear_cache
+          else
+            gollum_update_page(page_path, title, format, content, commit_details)
+          end
+        end
       end
 
       def pages
@@ -149,6 +152,14 @@ module Gitlab
         nil
       end
 
+      def gollum_update_page(page_path, title, format, content, commit_details)
+        assert_type!(format, Symbol)
+        assert_type!(commit_details, CommitDetails)
+
+        gollum_wiki.update_page(gollum_page_by_path(page_path), title, format, content, commit_details.to_h)
+        nil
+      end
+
       def gollum_find_page(title:, version: nil, dir: nil)
         if version
           version = Gitlab::Git::Commit.find(@repository, version).id
@@ -172,6 +183,10 @@ module Gitlab
         gitaly_wiki_client.write_page(name, format, content, commit_details)
       end
 
+      def gitaly_update_page(page_path, title, format, content, commit_details)
+        gitaly_wiki_client.update_page(page_path, title, format, content, commit_details)
+      end
+
       def gitaly_delete_page(page_path, commit_details)
         gitaly_wiki_client.delete_page(page_path, commit_details)
       end