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

EA-118488 - NFE: GitAnnotationProvider.parseAnnotations

Browse Source 
Fix regression after conversion of GitSimpleHandler to GitLineHandler
in dd934a2ca2:
CR, LF, CRLF line separators are silently converted to LF, breaking annotations parser.
This commit is contained in:
Aleksey Pivovarov
2018-09-06 16:09:00 +03:00
parent c973ec0237
commit 1665ac9863
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+4 -4
View File
@@ -18,6 +18,7 @@ import com.intellij.openapi.vcs.annotate.FileAnnotation;
import com.intellij.openapi.vcs.history.*;
import com.intellij.openapi.vcs.vfs.VcsFileSystem;
import com.intellij.openapi.vcs.vfs.VcsVirtualFile;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Interner;
@@ -35,9 +36,8 @@ import git4idea.GitRevisionNumber;
import git4idea.GitUtil;
import git4idea.GitVcs;
import git4idea.annotate.GitFileAnnotation.LineInfo;
import git4idea.commands.Git;
import git4idea.commands.GitBinaryHandler;
import git4idea.commands.GitCommand;
import git4idea.commands.GitLineHandler;
import git4idea.config.GitVcsApplicationSettings;
import git4idea.config.GitVcsApplicationSettings.AnnotateDetectMovementsOption;
import git4idea.history.GitFileHistory;
@@ -145,7 +145,7 @@ public class GitAnnotationProvider implements AnnotationProviderEx {
setProgressIndicatorText(GitBundle.message("computing.annotation", file.getName()));
VirtualFile root = GitUtil.getGitRoot(repositoryFilePath);
GitLineHandler h = new GitLineHandler(myProject, root, GitCommand.BLAME);
GitBinaryHandler h = new GitBinaryHandler(myProject, root, GitCommand.BLAME);
h.setStdoutSuppressed(true);
h.addParameters("--porcelain", "-l", "-t");
h.addParameters("--encoding=UTF-8");
@@ -169,7 +169,7 @@ public class GitAnnotationProvider implements AnnotationProviderEx {
}
h.endOptions();
h.addRelativePaths(repositoryFilePath);
String output = Git.getInstance().runCommand(h).getOutputOrThrow();
String output = new String(h.run(), CharsetToolkit.UTF8_CHARSET);
GitFileAnnotation fileAnnotation = parseAnnotations(revision, file, root, output);