# HG changeset patch # User Dmitry Neverov # Date 1415372709 -3600 # Node ID 1558f8257474b6a65160958cbf16f959cb4c3b86 # Parent c28e68e222721357f2db58cabaaa482ef9e06666 gather progress only if command reports it diff -r c28e68e22272 -r 1558f8257474 mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java --- 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 { diff -r c28e68e22272 -r 1558f8257474 mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java --- 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) {