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

VCS History Diff: don't load file revisions in AWT

Browse Source
This commit is contained in:
Kirill Likhodedov
2011-04-18 13:15:01 +04:00
parent 1264499e88
commit e0cb157cb8
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+33 -23
View File
@@ -609,30 +609,40 @@ public class FileHistoryPanelImpl<S extends CommittedChangeList, U extends Chang
}
private void showDifferences(Project project, VcsFileRevision revision1, VcsFileRevision revision2) {
VcsFileRevision left = revision1;
VcsFileRevision right = revision2;
if (VcsHistoryUtil.compare(revision1, revision2) > 0) {
left = revision2;
right = revision1;
}
try {
final String leftTitle = left.getRevisionNumber().asString() + (left instanceof CurrentRevision ? " (" + VcsBundle.message("diff.title.local") + ")" : "");
final String rightTitle = right.getRevisionNumber().asString() + (right instanceof CurrentRevision ? " (" + VcsBundle.message("diff.title.local") + ")" : "");
VcsHistoryUtil.showDiff(project, myFilePath, left, right, leftTitle, rightTitle);
} catch (final VcsException e) {
WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
public void run() {
Messages.showErrorDialog(VcsBundle.message("message.text.cannot.show.differences", e.getLocalizedMessage()),
VcsBundle.message("message.title.show.differences"));
private void showDifferences(final Project project, final VcsFileRevision revision1, final VcsFileRevision revision2) {
new Task.Backgroundable(project, "Loading revisions to compare") {
@Override
public void run(@NotNull ProgressIndicator indicator) {
VcsFileRevision left = revision1;
VcsFileRevision right = revision2;
if (VcsHistoryUtil.compare(revision1, revision2) > 0) {
left = revision2;
right = revision1;
}
}, null, project);
} catch (IOException e) {
LOG.error(e);
} catch (ProcessCanceledException ex) {
LOG.info(ex);
}
try {
final String leftTitle = left.getRevisionNumber().asString() +
(left instanceof CurrentRevision ? " (" + VcsBundle.message("diff.title.local") + ")" : "");
final String rightTitle = right.getRevisionNumber().asString() +
(right instanceof CurrentRevision ? " (" + VcsBundle.message("diff.title.local") + ")" : "");
VcsHistoryUtil.showDiff(project, myFilePath, left, right, leftTitle, rightTitle);
}
catch (final VcsException e) {
WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
public void run() {
Messages.showErrorDialog(VcsBundle.message("message.text.cannot.show.differences", e.getLocalizedMessage()),
VcsBundle.message("message.title.show.differences"));
}
}, null, project);
}
catch (IOException e) {
LOG.error(e);
}
catch (ProcessCanceledException ex) {
LOG.info(ex);
}
}
}.queue();
}
protected JComponent createCenterPanel() {
platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java
+7 -2
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.encoding.EncodingManager;
import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
import com.intellij.util.WaitForProgressToShow;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
@@ -80,10 +81,14 @@ public class VcsHistoryUtil {
diffData.setContentTitles(title1, title2);
diffData.setContents(createContent(project, content1, revision1, doc, charset, fileType),
createContent(project, content2, revision2, doc, charset, fileType));
DiffManager.getInstance().getDiffTool().show(diffData);
WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
public void run() {
DiffManager.getInstance().getDiffTool().show(diffData);
}
}, null, project);
}
public static byte[] loadRevisionContent(VcsFileRevision revision) throws VcsException, IOException {
public static byte[] loadRevisionContent(VcsFileRevision revision) throws VcsException, IOException {
byte[] content = revision.getContent();
if (content == null) {
revision.loadContent();