Mercurial > hg > mercurial

changeset 893:1558f8257474

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gather progress only if command reports it
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 07 Nov 2014 16:05:09 +0100
parents c28e68e22272
children b160c0da9f7e
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java	Fri Nov 07 16:04:52 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java	Fri Nov 07 16:05:09 2014 +0100
@@ -121,7 +121,7 @@
     ByteArrayOutputStream stdoutBuffer = new ByteArrayOutputStream();
     ProgressParser.ProgressConsumer progressConsumer = settings.getProgressConsumer();
     ByteArrayOutputStream stderrBuffer;
-    if (progressConsumer != null) {
+    if (progressConsumer != null && cli.hasProgress()) {
       stderrBuffer =  new LineAwareByteArrayOutputStream(Charset.forName("UTF-8"), new ProgressParser(progressConsumer));
       ((LineAwareByteArrayOutputStream) stderrBuffer).setCREndsLine(true);
     } else {
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java	Fri Nov 07 16:04:52 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java	Fri Nov 07 16:05:09 2014 +0100
@@ -179,6 +179,10 @@
     myHasProgress = hasProgress;
   }
 
+  public boolean hasProgress() {
+    return myHasProgress;
+  }
+
   public void logCommandStarted(@NotNull MercurialProgress progress) {
     if (!isEmpty(myDescription)) {
       if (myHasProgress) {