Some fix around PreReceiveSheelHook #214

* Remove debug print
* Remove .git in filepath
* now PreReceiveShellHook is initialized in hooks dict
* now PreReceiveShellHook send all refs to hook stdin
* now all ref are presents in status when hook fail
* append PreReceiveShellHook test

dulwich/hooks.py

@@ -148,11 +148,10 @@ class PreReceiveShellHook(ShellHook):
     """pre-receive shell hook"""
 
     def __init__(self, controldir):
-        filepath = os.path.join(controldir, '.git', 'hooks', 'pre-receive')
+        filepath = os.path.join(controldir, 'hooks', 'pre-receive')
         ShellHook.__init__(self, 'pre-receive', filepath, 0)
 
     def exists(self):
-        print(self.filepath)
         return os.path.exists(self.filepath)
 
     def execute(self, stdin):

dulwich/repo.py

@@ -63,6 +63,7 @@ from dulwich.hooks import (
     PreCommitShellHook,
     PostCommitShellHook,
     CommitMsgShellHook,
+    PreReceiveShellHook
     )
 
 from dulwich.refs import (
@@ -674,6 +675,7 @@ class Repo(BaseRepo):
         self.hooks['pre-commit'] = PreCommitShellHook(self.controldir())
         self.hooks['commit-msg'] = CommitMsgShellHook(self.controldir())
         self.hooks['post-commit'] = PostCommitShellHook(self.controldir())
+        self.hooks['pre-receive'] = PreReceiveShellHook(self.controldir())
 
     def controldir(self):
         """Return the path of the control directory."""

dulwich/server.py

@@ -82,7 +82,6 @@ from dulwich.refs import (
 from dulwich.repo import (
     Repo,
     )
-from hooks import PreReceiveShellHook
 
 
 logger = log_utils.getLogger(__name__)
@@ -822,19 +821,23 @@ class ReceivePackHandler(Handler):
             client_refs.append(ref.split())
             ref = self.proto.read_pkt_line()
 
-        hook = PreReceiveShellHook(self.repo.path)
+        hook = self.hooks.get('pre-receive', None)
         ret = 0
-        if hook.exists():
-            ret = hook.execute(stdin=' '.join(client_refs[0]))
+        if hook and hook.exists():
+            ret = hook.execute(
+                stdin='\n'.join([' '.join(i) for i in client_refs])
+            )
             self.proto.write_sideband(2, hook.stdout)
 
         if ret == 0:
-            # backend can now deal with this refs and read a pack using self.read
+            # backend can now deal with this refs and read a
+            # pack using self.read
             status = self._apply_pack(client_refs)
         else:
             status = [
                 ('unpack', 'ok'),
-                (client_refs[0][-1], 'pre-receive hook declined')
+            ] + [
+                (r[-1], 'pre-receive hook declined') for r in client_refs
             ]
 
         # when we have read all the pack from the client, send a status report

dulwich/tests/test_hooks.py

@@ -28,13 +28,13 @@ from dulwich.hooks import (
     PreCommitShellHook,
     PostCommitShellHook,
     CommitMsgShellHook,
+    PreReceiveShellHook
 )
 
 from dulwich.tests import TestCase
 
 
 class ShellHookTests(TestCase):
-
     def setUp(self):
         if os.name != 'posix':
             self.skipTest('shell hook tests requires POSIX shell')
@@ -126,3 +126,45 @@ exit 1
 
         hook.execute()
         self.assertFalse(os.path.exists(path))
+
+    def test_hook_pre_receive_success(self):
+        repo_dir = os.path.join(tempfile.mkdtemp())
+        os.makedirs(os.path.join(repo_dir, 'hooks'))
+        self.addCleanup(shutil.rmtree, repo_dir)
+
+        pre_receive = os.path.join(repo_dir, 'hooks', 'pre-receive')
+        hook = PreReceiveShellHook(repo_dir)
+
+        with open(pre_receive, 'wb') as f:
+            f.write("""#!/bin/sh
+
+while read x ; do echo $x ; done
+exit 0
+            """)
+
+        os.chmod(pre_receive, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
+
+        self.assertTrue(hook.exists())
+        self.assertEqual(hook.execute("line1\nline2\nline3\n"), 0)
+        self.assertEqual(
+            hook.stdout,
+            "line1\nline2\nline3\n"
+        )
+
+    def test_hook_pre_receive_fail(self):
+        repo_dir = os.path.join(tempfile.mkdtemp())
+        os.makedirs(os.path.join(repo_dir, 'hooks'))
+        self.addCleanup(shutil.rmtree, repo_dir)
+
+        pre_receive = os.path.join(repo_dir, 'hooks', 'pre-receive')
+        hook = PreReceiveShellHook(repo_dir)
+
+        with open(pre_receive, 'wb') as f:
+            f.write("""#!/bin/sh
+exit 1
+            """)
+
+        os.chmod(pre_receive, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
+
+        self.assertTrue(hook.exists())
+        self.assertEqual(hook.execute("line1\nline2\nline3\n"), 1)