Mercurial > hg > mercurial
changeset 829:568bb3e7a8eb
fix LogCommandTest (incorrect setEncoding => -Dfile.encoding=... )
author | eugene.petrenko@jetbrains.com |
---|---|
date | Fri, 30 May 2014 17:35:01 +0200 |
parents | 8d02c7b1f812 |
children | ef19cc8d5bc1 |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MercurialCommandLine.java |
diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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); }