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

[git] IDEA-89445 Update the IO-File of the FilePath to handle moves of the file (when VirtualFile is updated, but io-file is not)

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-08-02 21:00:12 +04:00
parent 89a78bbd6a
commit 68d05e25a7
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
+12 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.FilePathImpl;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.history.*;
@@ -160,7 +161,7 @@ public class GitHistoryProvider implements VcsHistoryProvider, VcsCacheableHisto
partner.reportCreatedEmptySession(emptySession);
final GitExecutableValidator validator = GitVcs.getInstance(myProject).getExecutableValidator();
try {
GitHistoryUtils.history(myProject, path, null, new Consumer<GitFileRevision>() {
GitHistoryUtils.history(myProject, refreshPath(path), null, new Consumer<GitFileRevision>() {
public void consume(GitFileRevision gitFileRevision) {
partner.acceptRevision(gitFileRevision);
}
@@ -177,8 +178,17 @@ public class GitHistoryProvider implements VcsHistoryProvider, VcsCacheableHisto
}
/**
* {@inheritDoc}
* Refreshes the IO File inside this FilePath to let it survive moves.
*/
@NotNull
private static FilePath refreshPath(@NotNull FilePath path) {
VirtualFile virtualFile = path.getVirtualFile();
if (virtualFile == null) {
return path;
}
return new FilePathImpl(virtualFile);
}
public boolean supportsHistoryForDirectories() {
return true;
}