1 files changed, 36 insertions, 15 deletions

diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb
index bd90d24a2ec..24f027d8da4 100644
--- a/lib/gitlab/git/hook.rb
+++ b/lib/gitlab/git/hook.rb
@@ -1,35 +1,43 @@
+# Gitaly note: JV: looks like this is only used by Gitlab::Git::HooksService in
+# app/services. We shouldn't bother migrating this until we know how
+# Gitlab::Git::HooksService will be migrated.
+
 module Gitlab
   module Git
     class Hook
       GL_PROTOCOL = 'web'.freeze
-      attr_reader :name, :repo_path, :path
+      attr_reader :name, :path, :repository
 
-      def initialize(name, repo_path)
+      def initialize(name, repository)
         @name = name
-        @repo_path = repo_path
+        @repository = repository
         @path = File.join(repo_path.strip, 'hooks', name)
       end
 
+      def repo_path
+        repository.path
+      end
+
       def exists?
         File.exist?(path)
       end
 
-      def trigger(gl_id, oldrev, newrev, ref)
+      def trigger(gl_id, gl_username, oldrev, newrev, ref)
         return [true, nil] unless exists?
 
         Bundler.with_clean_env do
           case name
           when "pre-receive", "post-receive"
-            call_receive_hook(gl_id, oldrev, newrev, ref)
+            call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
           when "update"
-            call_update_hook(gl_id, oldrev, newrev, ref)
+            call_update_hook(gl_id, gl_username, oldrev, newrev, ref)
           end
         end
       end
 
       private
 
-      def call_receive_hook(gl_id, oldrev, newrev, ref)
+      def call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
         changes = [oldrev, newrev, ref].join(" ")
 
         exit_status = false
@@ -37,8 +45,10 @@ module Gitlab
 
         vars = {
           'GL_ID' => gl_id,
+          'GL_USERNAME' => gl_username,
           'PWD' => repo_path,
-          'GL_PROTOCOL' => GL_PROTOCOL
+          'GL_PROTOCOL' => GL_PROTOCOL,
+          'GL_REPOSITORY' => repository.gl_repository
         }
 
         options = {
@@ -71,16 +81,27 @@ module Gitlab
         [exit_status, exit_message]
       end
 
-      def call_update_hook(gl_id, oldrev, newrev, ref)
-        Dir.chdir(repo_path) do
-          stdout, stderr, status = Open3.capture3({ 'GL_ID' => gl_id }, path, ref, oldrev, newrev)
-          [status.success?, stderr.presence || stdout]
-        end
+      def call_update_hook(gl_id, gl_username, oldrev, newrev, ref)
+        env = {
+          'GL_ID' => gl_id,
+          'GL_USERNAME' => gl_username,
+          'PWD' => repo_path
+        }
+
+        options = {
+          chdir: repo_path
+        }
+
+        args = [ref, oldrev, newrev]
+
+        stdout, stderr, status = Open3.capture3(env, path, *args, options)
+        [status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe]
       end
 
       def retrieve_error_message(stderr, stdout)
-        err_message = stderr.gets
-        err_message.blank? ? stdout.gets : err_message
+        err_message = stderr.read
+        err_message = err_message.blank? ? stdout.read : err_message
+        err_message.gsub(/\R/, "<br>").html_safe
       end
     end
   end