merge with branch 1.x

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/MacOSHgInstaller.java

@@ -35,7 +35,6 @@ package sonia.scm.installer;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgHealthCheck.java

@@ -0,0 +1,116 @@
+/**
+ * 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 com.google.inject.Inject;
+
+import sonia.scm.plugin.Extension;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+
+/**
+ * Simple {@link HealthCheck} for mercurial repositories.
+ *
+ * @author Sebastian Sdorra
+ * @since 1.39
+ */
+@Extension
+public final class HgHealthCheck extends DirectoryHealthCheck
+{
+
+  /** Field description */
+  private static final HealthCheckFailure COULD_NOT_FIND_DOT_HG_DIRECTORY =
+    new HealthCheckFailure("6bOdhOXpB1", "Could not find .hg directory",
+      "The mercurial repository does not contain .hg directory.");
+
+  /** Field description */
+  private static final String DOT_HG = ".hg";
+
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param repositoryManager
+   */
+  @Inject
+  public HgHealthCheck(RepositoryManager repositoryManager)
+  {
+    super(repositoryManager);
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param repository
+   * @param directory
+   *
+   * @return
+   */
+  @Override
+  protected HealthCheckResult check(Repository repository, File directory)
+  {
+    HealthCheckResult result = HealthCheckResult.healthy();
+    File dotHgDirectory = new File(directory, DOT_HG);
+
+    if (!dotHgDirectory.exists())
+    {
+      result = HealthCheckResult.unhealthy(COULD_NOT_FIND_DOT_HG_DIRECTORY);
+    }
+
+    return result;
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Returns {@code true} if the repository is from type mercurial.
+   *
+   *
+   * @param repository repository for the health check
+   *
+   * @return {@code true} for a mercurial repository
+   */
+  @Override
+  protected boolean isCheckResponsible(Repository repository)
+  {
+    return HgRepositoryHandler.TYPE_NAME.equalsIgnoreCase(repository.getType());
+  }
+}

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

@@ -42,7 +42,6 @@ import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgContext;
 import sonia.scm.repository.HgContextProvider;
 import sonia.scm.repository.HgHookManager;
-import sonia.scm.web.filter.BasicAuthenticationFilter;
 
 /**
  *