Mercurial > hg > mercurial
changeset 122:20cfe50e3b81
fix error processing (hg on windows can return -1 exit code)
| author | Pavel.Sher |
|---|---|
| date | Fri, 24 Sep 2010 19:35:07 +0400 |
| parents | e8125034f6a9 |
| children | 62fe3e69cee6 3ee5a8558eed |
| files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
| diffstat | 2 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java Fri Sep 24 17:37:27 2010 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java Fri Sep 24 19:35:07 2010 +0400 @@ -30,7 +30,7 @@ private static final int DEFAULT_COMMAND_TIMEOUT_SEC = 3600; public static void checkCommandFailed(@NotNull String cmdName, @NotNull ExecResult res) throws VcsException { - if (res.getExitCode() > 0 || res.getException() != null) { + if (res.getExitCode() != 0 || res.getException() != null) { commandFailed(cmdName, res); } if (res.getStderr().length() > 0) {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Sep 24 17:37:27 2010 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Sep 24 19:35:07 2010 +0400 @@ -278,15 +278,6 @@ assertEquals(md1.getDescription(), "file modified"); } - public void test_collect_changes_after_merge() throws IOException, VcsException { - VcsRootImpl vcsRoot = createVcsRoot(simpleRepo()); - - List<ModificationData> changes = collectChanges(vcsRoot, "6:b9deb9a1c6f4", "12:1870e1100fab", IncludeRule.createDefaultInstance()); - for (ModificationData md: changes) { - System.out.println(md); - } - } - public void test_full_patch_from_branch() throws IOException, VcsException { setName("patch3"); VcsRootImpl vcsRoot = createVcsRoot(simpleRepo(), "test_branch");