Mercurial > hg > mercurial
changeset 614:f6efcbc52d11 Gaya-8.0.x
For non-windows OSes assume that mercurial is in path instead of using bundled win executable
| author | Dmitry Neverov <dmitry.neverov@gmail.com> |
|---|---|
| date | Thu, 01 Aug 2013 11:35:55 +0400 |
| parents | a30befaa4349 |
| children | 7ea82d063131 |
| files | mercurial-tests/mercurial-tests.iml mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ <orderEntry type="library" name="TeamCity Vcs Api" level="project" /> <orderEntry type="module" module-name="mercurial-server-tc" /> <orderEntry type="library" name="quartz-1.6.0" level="project" /> + <orderEntry type="library" name="IDEA-openapi" level="project" /> </component> </module>
--- 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 }