From 918430251c003620fc7b8909e4d7d52d5d24d828 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 21 Jul 2011 21:24:27 +0200
Subject: [PATCH] pass nodeid to mercurial rest hook

---
 .../sonia/scm/api/rest/resources/HgHookCallback.java     | 7 +++++--
 .../scm-hg-plugin/src/main/resources/sonia/scm/hghook.py | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgHookCallback.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgHookCallback.java
index 7b9c1973ea..e73cda683c 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgHookCallback.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/rest/resources/HgHookCallback.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
 /**
@@ -66,14 +67,16 @@ public class HgHookCallback
    *
    * @param repositoryName
    * @param type
+   * @param node
    *
    * @return
    */
   @GET
   public Response hookCallback(@PathParam("repository") String repositoryName,
-                               @PathParam("type") String type)
+                               @PathParam("type") String type,
+                               @QueryParam("node") String node)
   {
-    logger.warn("retrive hg hook {}", type);
+    logger.warn("retrive hg hook {}, node {}", type, node);
 
     return Response.ok().build();
   }
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 33182cd60f..0849f833e7 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
@@ -4,7 +4,7 @@
 # registration .hg/hgrc:
 #
 # [hooks]
-# incoming = python:scmhooks.callback
+# changegroup.scm = python:scmhooks.callback
 #
 
 import os, sys, urllib
@@ -19,6 +19,7 @@ if len(pythonPath) > 0:
 baseUrl = "${url}"
 
 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:)
+  if node != None:
+    url = baseUrl + os.path.basename(repo.root) + "/" + hooktype + "?node=" + node
+    conn = urllib.urlopen(url);
+    # todo validate (if conn.code == 200:)