From 36c962d407e8cb7ffdf40b4ed8c44f6c5ba3eeb8 Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 23 Jul 2012 17:49:04 +0400 Subject: [PATCH] IDEA-81265 Lossy cyrillic encoding (svn + shelve changes) --- .../src/org/jetbrains/idea/svn/SvnContentRevision.java | 6 +++--- .../src/org/jetbrains/idea/svn/history/SvnFileRevision.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnContentRevision.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnContentRevision.java index bc6209fe905f..c2df07de1ff1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnContentRevision.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnContentRevision.java @@ -36,7 +36,6 @@ import org.tmatesoft.svn.core.wc.SVNWCClient; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.nio.charset.Charset; /** * @author yole @@ -131,8 +130,9 @@ public class SvnContentRevision implements ContentRevision, MarkerVcsContentRevi throw new VcsException(e); } final byte[] bytes = buffer.toByteArray(); - final Charset charset = myFile.getCharset(); - return charset == null ? bytes : SvnUtil.decode(charset, bytes); + /*final Charset charset = myFile.getCharset(); + return charset == null ? bytes : SvnUtil.decode(charset, bytes);*/ + return bytes; } @NotNull diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java index e1051620339e..19065b5be2b1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java @@ -28,7 +28,6 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.impl.ContentRevisionCache; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnRevisionNumber; -import org.jetbrains.idea.svn.SvnUtil; import org.jetbrains.idea.svn.SvnVcs; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNLogEntry; @@ -169,7 +168,8 @@ public class SvnFileRevision implements VcsFileRevision { @Override public byte[] compute() throws VcsException, IOException { byte[] bytes = loadContent(); - return SvnUtil.decode(myCharset, bytes); + return bytes; + //return SvnUtil.decode(myCharset, bytes); } }); }