Mercurial > hg > mercurial
changeset 507:bee5c3240036
Merge branch Faradi-7.1.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 09 Nov 2012 15:07:48 +0400 |
parents | 6bc8a8c4ab2f (current diff) 892f95a0f82d (diff) |
children | f977639b9a1e |
files | mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java Mon Oct 29 17:56:44 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgFileUtil.java Fri Nov 09 15:07:48 2012 +0400 @@ -30,7 +30,7 @@ do { suffix++; dir = new File(parentDir, TEMP_DIR_PREFIX + suffix); - } while (!dir.createNewFile()); + } while (!dir.exists() && !dir.createNewFile()); dir.delete(); dir.mkdir(); return dir;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java Mon Oct 29 17:56:44 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java Fri Nov 09 15:07:48 2012 +0400 @@ -99,9 +99,10 @@ private boolean isMercurialNotFoundErrorMessage(@Nullable String message) { return message != null && - message.startsWith(MERCURIAL_NOT_FOUND_MESSAGE_PREFIX) && - (message.endsWith(MERCURIAL_NOT_FOUND_MESSAGE_SUFFIX1) || - message.endsWith(MERCURIAL_NOT_FOUND_MESSAGE_SUFFIX2)); + (message.startsWith(MERCURIAL_NOT_FOUND_MESSAGE_PREFIX) && + (message.endsWith(MERCURIAL_NOT_FOUND_MESSAGE_SUFFIX1) || + message.endsWith(MERCURIAL_NOT_FOUND_MESSAGE_SUFFIX2)) || + message.startsWith("CreateProcess") && message.endsWith("error=2")); } private void logStderr(String stderr) {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Oct 29 17:56:44 2012 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Nov 09 15:07:48 2012 +0400 @@ -255,6 +255,7 @@ cli.setExePath(vcsRoot.getProperty(Constants.HG_COMMAND_PATH_PROP)); cli.setWorkDirectory(vcsRoot.getProperty(Constants.REPOSITORY_PROP)); cli.setEnvParams(map("HGRCPATH", "")); + cli.setPassParentEnvs(true); cli.addParameter("tags"); CommandResult res = CommandUtil.runCommand(cli, new CommandSettings()); assertTrue(res.getStdout().contains("new_tag")); @@ -273,6 +274,7 @@ cli.setWorkDirectory(vcsRoot.getProperty(Constants.REPOSITORY_PROP)); cli.addParameter("tags"); cli.setEnvParams(map("HGRCPATH", "")); + cli.setPassParentEnvs(true); CommandResult res = CommandUtil.runCommand(cli, new CommandSettings()); assertTrue(res.getStdout().contains("branch_tag")); assertTrue(res.getStdout().contains("7:376dcf05cd2a"));