kallithea Changeset - 20e850093f1c

Changeset - 20e850093f1c

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich (mads) - 5 years ago 2021-01-11 23:28:09
mads@kiilerich.com

hooks: on Git, invoke hooks/post-receive-custom from hooks/post-receive

Make it possible for admins to install all kinds of hooks.

Based on a patch by Tim Ooms.

A more generic solution would be nice, but for now we aim for this minimal
solution.

4 files changed with 18 insertions and 3 deletions:

docs/setup.rst

docs/upgrade.rst

docs/usage/troubleshooting.rst

kallithea/templates/py/git_post_receive_hook.py

0 comments (0 inline, 0 general)

docs/setup.rst

➞

Show inline comments

@@ @@ -345,14 +345,16 @@ To add another custom hook simply fill i @@
 ``<name>.<hook_type>`` and the second with the hook path. Example hooks
 can be found in ``kallithea.lib.hooks``.
 Kallithea will also use some hooks internally. They cannot be modified, but
 some of them can be enabled or disabled in the *VCS* section.
 Kallithea has no support for custom Git hooks. Kallithea will install and use
 Git hooks internally, and they might collide with manually installed hooks.
 Kallithea does not actively support custom Git hooks, but hooks can be installed
 manually in the file system. Kallithea will install and use the
 ``post-receive`` Git hook internally, but it will then invoke
 ``post-receive-custom`` if present.
 Changing default encoding
 -------------------------
 By default, Kallithea uses UTF-8 encoding.

docs/upgrade.rst

➞

Show inline comments

@@ @@ -233,12 +233,15 @@ Kallithea. As these hooks are created in @@
 filesystem, they are not updated automatically when upgrading Kallithea itself.
 To update the hooks of your Git repositories, run::
     kallithea-cli repo-scan -c my.ini --install-git-hooks
 Watch out for warnings like ``skipping overwriting hook file X``, then fix it
 and rerun, or consider using ``--overwrite-git-hooks`` instead.
 Or:
 * Go to *Admin > Settings > Remap and Rescan*
 * Select the checkbox *Install Git hooks*
 * Click the button *Rescan repositories*

docs/usage/troubleshooting.rst

➞

Show inline comments

@@ @@ -49,12 +49,13 @@ Troubleshooting @@
     If using Git, install the hooks manually in each repository, for example by
     creating a file ``gitrepo/hooks/pre-receive``.
     Note that Kallithea uses the ``post-receive`` hook internally.
     Kallithea will not work properly if another post-receive hook is installed instead.
     You might also accidentally overwrite your own post-receive hook with the Kallithea hook.
     Instead, put your post-receive hook in ``post-receive-custom``, and the Kallithea hook will invoke it.
     You can also use Kallithea-extensions to connect to callback hooks,
     for both Git and Mercurial.
+|

kallithea/templates/py/git_post_receive_hook.py

➞

Show inline comments

@@ @@ -6,12 +6,13 @@ by Kallithea - don't customize it manual @@
 When Kallithea invokes Git, the KALLITHEA_EXTRAS environment variable will
 contain additional info like the Kallithea instance and user info that this
 hook will use.
 """
 import os
 import subprocess
 import sys
 import kallithea.bin.vcs_hooks
 # Set output mode on windows to binary for stderr.
@@ @@ -27,11 +28,19 @@ KALLITHEA_HOOK_VER = '_TMPL_' @@
 os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER
 def main():
     repo_path = os.path.abspath('.')
     git_stdin_lines = sys.stdin.readlines()
     sys.exit(kallithea.bin.vcs_hooks.post_receive(repo_path, git_stdin_lines))
     status = kallithea.bin.vcs_hooks.post_receive(repo_path, git_stdin_lines)
     custom_hook = os.path.join(repo_path, 'hooks', 'post-receive-custom')
     custom_status = None
     if os.access(custom_hook, os.X_OK):
         result = subprocess.run([custom_hook], input=''.join(git_stdin_lines), universal_newlines=True)
         custom_status = result.returncode
     sys.exit(status or custom_status)
 if __name__ == '__main__':
     main()

0 comments (0 inline, 0 general)