hooks: expose logic to fetch hook file information.

vcsserver/git.py

@@ -724,6 +724,16 b' class GitRemote(object):'
         repo = self._factory.repo(wire)
         return install_git_hooks(repo.path, repo.bare, force_create=force)
 
+    @reraise_safe_exceptions
+    def get_hooks_info(self, wire):
+        from vcsserver.hook_utils import (
+            get_git_pre_hook_version, get_git_post_hook_version)
+        repo = self._factory.repo(wire)
+        return {
+            'pre_version': get_git_pre_hook_version(repo.path, repo.bare),
+            'post_version': get_git_post_hook_version(repo.path, repo.bare),
+        }
+
 
 def str_to_dulwich(value):
     """

vcsserver/hg.py

@@ -27,6 +27,7 b' from mercurial import commands'
 from mercurial import unionrepo
 from mercurial import verify
 
+import vcsserver
 from vcsserver import exceptions
 from vcsserver.base import RepoFactory, obfuscate_qs, raise_from_original
 from vcsserver.hgcompat import (
@@ -793,3 +794,10 b' class HgRemote(object):'
     def install_hooks(self, wire, force=False):
         # we don't need any special hooks for Mercurial
         pass
+
+    @reraise_safe_exceptions
+    def get_hooks_info(self, wire):
+        return {
+            'pre_version': vcsserver.__version__,
+            'post_version': vcsserver.__version__,
+        }

vcsserver/hook_utils/__init__.py

@@ -29,6 +29,14 b' import vcsserver'
 log = logging.getLogger(__name__)
 
 
+def get_git_hooks_path(repo_path, bare):
+    hooks_path = os.path.join(repo_path, 'hooks')
+    if not bare:
+        hooks_path = os.path.join(repo_path, '.git', 'hooks')
+
+    return hooks_path
+
+
 def install_git_hooks(repo_path, bare, executable=None, force_create=False):
     """
     Creates a RhodeCode hook inside a git repository
@@ -38,9 +46,8 b' def install_git_hooks(repo_path, bare, e'
     :param force_create: Create even if same name hook exists
     """
     executable = executable or sys.executable
-    hooks_path = os.path.join(repo_path, 'hooks')
-    if not bare:
-        hooks_path = os.path.join(repo_path, '.git', 'hooks')
+    hooks_path = get_git_hooks_path(repo_path, bare)
+
     if not os.path.isdir(hooks_path):
         os.makedirs(hooks_path, mode=0o777)
 
@@ -78,6 +85,12 b' def install_git_hooks(repo_path, bare, e'
     return True
 
 
+def get_svn_hooks_path(repo_path):
+    hooks_path = os.path.join(repo_path, 'hooks')
+
+    return hooks_path
+
+
 def install_svn_hooks(repo_path, executable=None, force_create=False):
     """
     Creates RhodeCode hooks inside a svn repository
@@ -87,7 +100,7 b' def install_svn_hooks(repo_path, executa'
     :param force_create: Create even if same name hook exists
     """
     executable = executable or sys.executable
-    hooks_path = os.path.join(repo_path, 'hooks')
+    hooks_path = get_svn_hooks_path(repo_path)
     if not os.path.isdir(hooks_path):
         os.makedirs(hooks_path, mode=0o777)
 
@@ -127,6 +140,19 b' def install_svn_hooks(repo_path, executa'
     return True
 
 
+def get_version_from_hook(hook_path):
+    version = ''
+    hook_content = read_hook_content(hook_path)
+    matches = re.search(r'(?:RC_HOOK_VER)\s*=\s*(.*)', hook_content)
+    if matches:
+        try:
+            version = matches.groups()[0]
+            log.debug('got version %s from hooks.', version)
+        except Exception:
+            log.exception("Exception while reading the hook version.")
+    return version.replace("'", "")
+
+
 def check_rhodecode_hook(hook_path):
     """
     Check if the hook was created by RhodeCode
@@ -134,16 +160,11 b' def check_rhodecode_hook(hook_path):'
     if not os.path.exists(hook_path):
         return True
 
-    log.debug('hook exists, checking if it is from rhodecode')
-    hook_content = read_hook_content(hook_path)
-    matches = re.search(r'(?:RC_HOOK_VER)\s*=\s*(.*)', hook_content)
-    if matches:
-        try:
-            version = matches.groups()[0]
-            log.debug('got version %s from hooks.', version)
+    log.debug('hook exists, checking if it is from RhodeCode')
+
+    version = get_version_from_hook(hook_path)
+    if version:
             return True
-        except Exception:
-            log.exception("Exception while reading the hook version.")
 
     return False
 
@@ -152,3 +173,31 b' def read_hook_content(hook_path):'
     with open(hook_path, 'rb') as f:
         content = f.read()
     return content
+
+
+def get_git_pre_hook_version(repo_path, bare):
+    hooks_path = get_git_hooks_path(repo_path, bare)
+    _hook_file = os.path.join(hooks_path, 'pre-receive')
+    version = get_version_from_hook(_hook_file)
+    return version
+
+
+def get_git_post_hook_version(repo_path, bare):
+    hooks_path = get_git_hooks_path(repo_path, bare)
+    _hook_file = os.path.join(hooks_path, 'post-receive')
+    version = get_version_from_hook(_hook_file)
+    return version
+
+
+def get_svn_pre_hook_version(repo_path):
+    hooks_path = get_svn_hooks_path(repo_path)
+    _hook_file = os.path.join(hooks_path, 'pre-commit')
+    version = get_version_from_hook(_hook_file)
+    return version
+
+
+def get_svn_post_hook_version(repo_path):
+    hooks_path = get_svn_hooks_path(repo_path)
+    _hook_file = os.path.join(hooks_path, 'post-commit')
+    version = get_version_from_hook(_hook_file)
+    return version

vcsserver/svn.py

@@ -458,6 +458,16 b' class SvnRemote(object):'
         return install_svn_hooks(
             repo_path, executable=executable, force_create=force)
 
+    @reraise_safe_exceptions
+    def get_hooks_info(self, wire):
+        from vcsserver.hook_utils import (
+            get_svn_pre_hook_version, get_svn_post_hook_version)
+        repo_path = wire['path']
+        return {
+            'pre_version': get_svn_pre_hook_version(repo_path),
+            'post_version': get_svn_post_hook_version(repo_path),
+        }
+
 
 class SvnDiffer(object):
     """