# HG changeset patch # User Dmitry Neverov # Date 1375342555 -14400 # Node ID f6efcbc52d11509b8de3d5b6cbbcfe6f7e63e766 # Parent a30befaa434946b66e38201b299f4f7c4bdb3eec For non-windows OSes assume that mercurial is in path instead of using bundled win executable diff -r a30befaa4349 -r f6efcbc52d11 mercurial-tests/mercurial-tests.iml --- a/mercurial-tests/mercurial-tests.iml Thu Aug 01 11:34:58 2013 +0400 +++ b/mercurial-tests/mercurial-tests.iml Thu Aug 01 11:35:55 2013 +0400 @@ -21,6 +21,7 @@ + diff -r a30befaa4349 -r f6efcbc52d11 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java Thu Aug 01 11:34:58 2013 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java Thu Aug 01 11:35:55 2013 +0400 @@ -2,6 +2,7 @@ import jetbrains.buildServer.TempFiles; import jetbrains.buildServer.util.FileUtil; +import com.intellij.openapi.util.SystemInfo; import jetbrains.buildServer.vcs.CheckoutRules; import jetbrains.buildServer.vcs.VcsException; import jetbrains.buildServer.vcs.VcsRoot; @@ -22,11 +23,11 @@ public static String getHgPath() throws IOException { String providedHg = System.getenv(Constants.HG_PATH_ENV); - if (providedHg != null) { + if (providedHg != null) return providedHg; - } else { + if (SystemInfo.isWindows) return new File("mercurial-tests/testData/bin/hg.exe").getAbsolutePath(); - } + return "hg"; //assume it is somethere in the $PATH }