fix mercurial hooks on windows with repository structure

scm-core/src/main/java/sonia/scm/repository/RepositoryUtil.java

@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.repository;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sonia.scm.util.IOUtil;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ * @since 1.11
+ */
+public class RepositoryUtil
+{
+
+  /** the logger for RepositoryUtil */
+  private static final Logger logger =
+    LoggerFactory.getLogger(RepositoryUtil.class);
+  
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public static String getRepositoryName(AbstractRepositoryHandler handler, String directoryPath) throws IOException
+  {
+    return getRepositoryName(handler.getConfig().getRepositoryDirectory(), new File(directoryPath));
+  }
+  
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */ 
+  public static String getRepositoryName(SimpleRepositoryConfig config, String directoryPath) throws IOException
+  {
+    return getRepositoryName(config.getRepositoryDirectory(), new File(directoryPath));
+  }
+  
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public static String getRepositoryName(AbstractRepositoryHandler handler, File directory) throws IOException
+  {
+    return getRepositoryName(handler.getConfig().getRepositoryDirectory(), directory);
+  }
+  
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */ 
+  public static String getRepositoryName(SimpleRepositoryConfig config, File directory) throws IOException
+  {
+    return getRepositoryName(config.getRepositoryDirectory(), directory);
+  }
+  
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public static String getRepositoryName(File baseDirectory, File directory) throws IOException
+  {
+     String name = null;
+     
+     String path = directory.getCanonicalPath();
+     int directoryLength = baseDirectory.getCanonicalPath().length();
+
+     if (directoryLength < path.length())
+     {
+       name = IOUtil.trimSeperatorChars(path.substring(directoryLength));
+       // replace windows path seperator
+       name = name.replaceAll("\\\\", "/");
+     }
+     else if (logger.isWarnEnabled())
+     {
+        logger.warn("path is shorter as the main hg repository path");
+     }
+     
+     return name;
+  }
+}

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java

@@ -49,15 +49,14 @@ import sonia.scm.repository.HgRepositoryHookEvent;
 import sonia.scm.repository.RepositoryHookType;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.repository.RepositoryNotFoundException;
+import sonia.scm.repository.RepositoryUtil;
 import sonia.scm.security.CipherUtil;
 import sonia.scm.util.HttpUtil;
-import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
 import sonia.scm.web.security.WebSecurityContext;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import java.io.File;
 import java.io.IOException;
 
 import java.util.regex.Matcher;
@@ -348,20 +347,7 @@ public class HgHookCallbackServlet extends HttpServlet
        */
       try
       {
-        path = new File(path).getCanonicalPath();
+        name = RepositoryUtil.getRepositoryName(handler, path);
-
-        int directoryLength =
-          handler.getConfig().getRepositoryDirectory().getCanonicalPath()
-            .length();
-
-        if (directoryLength < path.length())
-        {
-          name = IOUtil.trimSeperatorChars(path.substring(directoryLength));
-        }
-        else if (logger.isWarnEnabled())
-        {
-          logger.warn("path is shorter as the main hg repository path");
-        }
       }
       catch (IOException ex)
       {