MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-81265 Lossy cyrillic encoding (svn + shelve changes)

Browse Source
This commit is contained in:
irengrig
2012-07-23 17:49:04 +04:00
parent d019234100
commit 36c962d407
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnContentRevision.java
+3 -3
View File
@@ -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
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnFileRevision.java
+2 -2
View File
@@ -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);
}
});
}