changeset 789:5cf7d1b3c476

Merge branch Gaya-8.1.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 30 Apr 2014 20:13:02 +0200
parents 969b545efa1b (current diff) 97ae319eed9b (diff)
children 249eb1d652a7
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LogCommand.java
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LogCommand.java	Wed Apr 30 12:49:40 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LogCommand.java	Wed Apr 30 20:13:02 2014 +0200
@@ -17,6 +17,7 @@
 
 import com.intellij.openapi.diagnostic.Logger;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialTemplate;
+import jetbrains.buildServer.util.StringUtil;
 import jetbrains.buildServer.vcs.VcsException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -145,7 +146,12 @@
             assignTrivialParents(changes);
           return changes;
         } catch (Exception e) {
-          LOG.error("Error while parsing log output:\n" + output, e);
+          int limit = myCommandSettings.getLogOutputLimit();
+          if (limit == -1) {
+            LOG.error("Error while parsing log output:\n" + output, e);
+          } else {
+            LOG.error("Error while parsing log output:\n" + StringUtil.truncateStringValueWithDotsAtEnd(output, limit), e);
+          }
           throw new VcsException("Error while parsing log output, see teamcity-vcs.log for details", e);
         }
       }