changeset 930:1f19b1a10edb

fix TW-40598. Report HG stdout errors ony if error is not empty and not spaces (was only non-empty check)
author eugene.petrenko@jetbrains.com
date Fri, 27 Mar 2015 20:28:33 +0100
parents ccb34ee7c03b
children 882cd9bdb4ff 5c28db706378
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java	Fri Feb 27 11:36:50 2015 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java	Fri Mar 27 20:28:33 2015 +0100
@@ -30,6 +30,7 @@
 import java.util.Set;
 
 import static com.intellij.openapi.util.text.StringUtil.isEmpty;
+import static com.intellij.openapi.util.text.StringUtil.isEmptyOrSpaces;
 import static java.util.Arrays.asList;
 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandUtil.removePrivateData;
 
@@ -96,7 +97,7 @@
     if (isFailure())
       logAndThrowError();
     String stderr = getSecureStderr();
-    if (!isEmpty(stderr)) {
+    if (!isEmptyOrSpaces(stderr)) {
       if (failWhenStderrIsNonEmpty)
         logAndThrowError();
       else
@@ -191,7 +192,7 @@
       message.append("[").append(myCommandWorkingDir).append("] ");
     message.append(getCommand()).append("' command failed.");
     String stderr = getSecureStderr();
-    if (!isEmpty(stderr)) {
+    if (!isEmptyOrSpaces(stderr)) {
       int logOutputLimit = mySettings.getLogOutputLimit();
       if (logOutputLimit == -1) {
         message.append("\nstderr:\n").append(stderr);
@@ -206,7 +207,7 @@
     StringBuilder message = new StringBuilder();
     message.append("'").append(getCommand()).append("' command failed.");
     String stderr = getSecureStderr();
-    if (!isEmpty(stderr)) {
+    if (!isEmptyOrSpaces(stderr)) {
       message.append("\n");
       int limit = mySettings.getExceptionOutputLimit();
       if (stderr.length() < limit || limit == -1) {