From 6d7b5fd2cc6885bb2213465ae8a5038eb47a3926 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 11 Aug 2012 16:04:12 +0200
Subject: [PATCH] fix hg.py instead of hg.bat

---
 .../scm/installer/HgPackageInstaller.java     |  4 ++--
 .../{HgBatFix.java => HgPyFix.java}           | 20 ++++++++++++-------
 .../scm/repository/HgRepositoryHandler.java   |  2 +-
 .../{HgBatFixTest.java => HgPyFixTest.java}   |  8 ++++----
 4 files changed, 20 insertions(+), 14 deletions(-)
 rename scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/{HgBatFix.java => HgPyFix.java} (92%)
 rename scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/{HgBatFixTest.java => HgPyFixTest.java} (94%)

diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageInstaller.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageInstaller.java
index f004ad170f..7af0722833 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageInstaller.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageInstaller.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.SCMContext;
 import sonia.scm.io.ZipUnArchiver;
 import sonia.scm.net.HttpClient;
-import sonia.scm.repository.HgBatFix;
+import sonia.scm.repository.HgPyFix;
 import sonia.scm.repository.HgConfig;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.util.IOUtil;
@@ -231,7 +231,7 @@ public class HgPackageInstaller implements Runnable
     config.setUseOptimizedBytecode(template.isUseOptimizedBytecode());
 
     // fix wrong hg.bat
-    HgBatFix.fixHgBat(SCMContext.getContext(), config);
+    HgPyFix.fixHgPy(SCMContext.getContext(), config);
 
     handler.storeConfig();
   }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBatFix.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPyFix.java
similarity index 92%
rename from scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBatFix.java
rename to scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPyFix.java
index 46f1bc8b22..1fa436a864 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBatFix.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgPyFix.java
@@ -54,7 +54,7 @@ import java.io.IOException;
  *
  * @author Sebastian Sdorra
  */
-public class HgBatFix
+public class HgPyFix
 {
 
   /** Field description */
@@ -63,6 +63,9 @@ public class HgBatFix
   /** Field description */
   private static final String HG_BAT = "hg.bat";
 
+  /** Field description */
+  private static final String HG_PY = "hg.py";
+
   /**
    * the logger for HgUtil
    */
@@ -77,7 +80,7 @@ public class HgBatFix
    * @param context
    * @param config
    */
-  public static void fixHgBat(SCMContextProvider context, HgConfig config)
+  public static void fixHgPy(SCMContextProvider context, HgConfig config)
   {
     String basePath = context.getBaseDirectory().getAbsolutePath();
 
@@ -85,8 +88,10 @@ public class HgBatFix
 
     if (hg.startsWith(basePath) && hg.endsWith(HG_BAT))
     {
+      File file = new File(hg);
 
-      fixHgBat(hg);
+      file = new File(file.getParentFile(), HG_PY);
+      fixHgPy(file);
     }
   }
 
@@ -95,10 +100,11 @@ public class HgBatFix
    *
    *
    * @param hg
+   *
+   * @param hgBat
    */
-  static void fixHgBat(String hg)
+  static void fixHgPy(File hgBat)
   {
-    File hgBat = new File(hg);
 
     if (hgBat.exists())
     {
@@ -110,7 +116,7 @@ public class HgBatFix
       {
         if (logger.isDebugEnabled())
         {
-          logger.debug("check hg.bat for setbinary at {}", hg);
+          logger.debug("check hg.bat for setbinary at {}", hgBat);
         }
 
         if (!isSetBinaryAvailable(hgBat))
@@ -130,7 +136,7 @@ public class HgBatFix
     }
     else if (logger.isWarnEnabled())
     {
-      logger.warn("could not find hg.bat at {}", hg);
+      logger.warn("could not find hg.bat at {}", hgBat);
     }
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
index 76e6f8aa09..bbdab43e4e 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
@@ -190,7 +190,7 @@ public class HgRepositoryHandler
     // fix wrong hg.bat from package installation
     if (SystemUtil.isWindows())
     {
-      HgBatFix.fixHgBat(context, getConfig());
+      HgPyFix.fixHgPy(context, getConfig());
     }
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgBatFixTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgPyFixTest.java
similarity index 94%
rename from scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgBatFixTest.java
rename to scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgPyFixTest.java
index 4b54265dd7..7e2dc1c489 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgBatFixTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgPyFixTest.java
@@ -54,7 +54,7 @@ import java.net.URL;
  *
  * @author Sebastian Sdorra
  */
-public class HgBatFixTest
+public class HgPyFixTest
 {
 
   /**
@@ -136,10 +136,10 @@ public class HgBatFixTest
    */
   private File testModify(File file)
   {
-    HgBatFix.fixHgBat(file.getAbsolutePath());
-    assertTrue(HgBatFix.isSetBinaryAvailable(file));
+    HgPyFix.fixHgPy(file);
+    assertTrue(HgPyFix.isSetBinaryAvailable(file));
 
-    File mod = new File(file.getParentFile(), HgBatFix.MODIFY_MARK);
+    File mod = new File(file.getParentFile(), HgPyFix.MODIFY_MARK);
 
     assertTrue(mod.exists());