# HG changeset patch
# User eugene.petrenko@jetbrains.com
# Date 1401464101 -7200
# Node ID 568bb3e7a8eb32bb60a0cd127c7ba2d507ccbbe0
# Parent  8d02c7b1f8124d093765aa77471c3e236d72dab1
fix LogCommandTest (incorrect setEncoding => -Dfile.encoding=... )

diff -r 8d02c7b1f812 -r 568bb3e7a8eb mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java	Fri May 30 17:29:51 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java	Fri May 30 17:35:01 2014 +0200
@@ -122,6 +122,7 @@
 
   @NotNull
   public GeneralCommandLine toGeneralCommandLine() {
+    final Charset charset = myCharset;
     final GeneralCommandLine cmd = new GeneralCommandLine() {
       @Override
       public String getCommandLineParams() {
@@ -132,6 +133,12 @@
       public String getCommandLineString() {
         return CommandUtil.removePrivateData(super.getCommandLineString(), myPrivateData);
       }
+
+      @Override
+      public Charset getCharset() {
+        if (charset != null) return charset;
+        return super.getCharset();
+      }
     };
 
     if (myExePath != null) {
@@ -142,10 +149,6 @@
       cmd.setWorkDirectory(myWorkingDirectory);
     }
 
-    if (myCharset != null) {
-      cmd.setCharset(myCharset);
-    }
-
     for (String argument : myArguments) {
       cmd.addParameter(argument);
     }