From b1606535a666bc4a2ee65a6d0df8c1d6f42baac6 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 21 Jul 2011 20:37:12 +0200 Subject: [PATCH] rename python hook --- .../src/main/java/sonia/scm/web/HgHookScriptFilter.java | 2 +- .../scm-hg-plugin/src/main/resources/sonia/scm/hghook.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookScriptFilter.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookScriptFilter.java index 1fb19f3994..9047c0a2e4 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookScriptFilter.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookScriptFilter.java @@ -147,7 +147,7 @@ public class HgHookScriptFilter extends HttpFilter IOUtil.mkdirs(cgiDirectory); - File hgHookScript = new File(cgiDirectory, "hg-hook.py"); + File hgHookScript = new File(cgiDirectory, "scmhooks.py"); if (logger.isDebugEnabled()) { diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hghook.py b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hghook.py index 0bcdd50940..33182cd60f 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hghook.py +++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hghook.py @@ -1,5 +1,12 @@ #!/usr/bin/env ${python} +# +# registration .hg/hgrc: +# +# [hooks] +# incoming = python:scmhooks.callback +# + import os, sys, urllib pythonPath = "${path}" @@ -11,7 +18,7 @@ if len(pythonPath) > 0: baseUrl = "${url}" -def scmhook(ui, repo, hooktype, node=None, source=None, **kwargs): +def callback(ui, repo, hooktype, node=None, source=None, **kwargs): url = baseUrl + os.path.basename(repo.root) + "/" + hooktype conn = urllib.urlopen(url); # todo validate (if conn.code == 200:)