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

[file-history] use VcsLogDiffHandler when comparing revisions in file history

Browse Source 
Since VcsLogDiffHandler can handle directory diff, this fixes IDEA-170456.
This commit is contained in:
Julia Beliaeva
2017-04-14 14:31:17 +03:00
parent d7c135b7b9
commit 099e618d73
2 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java
+15
View File
@@ -130,6 +130,21 @@ public class FileHistoryUi extends AbstractVcsLogUi {
return null;
}
@Nullable
public FilePath getPath(@NotNull VcsFullCommitDetails details) {
if (myPath.isDirectory()) return myPath;
List<Change> changes = collectRelevantChanges(details);
for (Change change : changes) {
ContentRevision revision = change.getAfterRevision();
if (revision != null) {
return revision.getFile();
}
}
return null;// file was deleted
}
@NotNull
public List<Change> collectRelevantChanges(@NotNull VcsFullCommitDetails details) {
Set<FilePath> fileNames = getFileNames(details);
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java
+45 -34
View File
@@ -18,22 +18,25 @@ package com.intellij.vcs.log.ui.actions.history;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction;
import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffContext;
import com.intellij.openapi.vcs.history.DiffFromHistoryHandler;
import com.intellij.openapi.vcs.history.StandardDiffFromHistoryHandler;
import com.intellij.openapi.vcs.history.VcsDiffUtil;
import com.intellij.openapi.vcs.history.VcsFileRevision;
import com.intellij.util.ObjectUtils;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.CommitId;
import com.intellij.vcs.log.VcsFullCommitDetails;
import com.intellij.vcs.log.data.LoadingDetails;
import com.intellij.vcs.log.VcsLogDiffHandler;
import com.intellij.vcs.log.history.FileHistoryUi;
import com.intellij.vcs.log.impl.VcsLogUtil;
import com.intellij.vcs.log.ui.VcsLogInternalDataKeys;
@@ -43,12 +46,13 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.List;
import static com.intellij.util.ObjectUtils.notNull;
public class CompareRevisionsFromHistoryAction extends AnAction implements DumbAware {
private static final String COMPARE_TEXT = "Compare";
private static final String COMPARE_DESCRIPTION = "Compare selected versions";
private static final String DIFF_TEXT = "Show Diff";
private static final String DIFF_DESCRIPTION = "Show diff with previous version";
@NotNull private final DiffFromHistoryHandler myDiffHandler = new StandardDiffFromHistoryHandler();
public void update(@NotNull AnActionEvent e) {
Project project = e.getProject();
@@ -61,31 +65,21 @@ public class CompareRevisionsFromHistoryAction extends AnAction implements DumbA
e.getPresentation().setVisible(true);
List<VcsFullCommitDetails> details = ui.getVcsLog().getSelectedDetails();
List<CommitId> commits = ui.getVcsLog().getSelectedCommits();
if (e.getInputEvent() instanceof KeyEvent) {
e.getPresentation().setEnabled(true);
}
else {
if (details.size() == 2) {
VcsFullCommitDetails detail0 = details.get(0);
VcsFullCommitDetails detail1 = details.get(1);
if (detail0 != null && !(detail0 instanceof LoadingDetails) &&
detail1 != null && !(detail1 instanceof LoadingDetails)) {
VcsFileRevision newestRevision = ui.createRevision(detail0);
VcsFileRevision olderRevision = ui.createRevision(detail1);
e.getPresentation().setEnabled(newestRevision != null && olderRevision != null && !filePath.isDirectory());
}
else {
e.getPresentation().setEnabled(!filePath.isDirectory());
}
if (commits.size() == 2) {
VcsLogDiffHandler handler = ui.getLogData().getLogProvider(commits.get(0).getRoot()).getDiffHandler();
e.getPresentation().setEnabled(handler != null);
}
else {
e.getPresentation().setEnabled(details.size() == 1);
e.getPresentation().setEnabled(commits.size() == 1);
}
}
if (details.size() == 2) {
if (commits.size() == 2) {
e.getPresentation().setText(COMPARE_TEXT);
e.getPresentation().setDescription(COMPARE_DESCRIPTION);
}
@@ -109,24 +103,41 @@ public class CompareRevisionsFromHistoryAction extends AnAction implements DumbA
VcsLogUtil.triggerUsage(e);
List<CommitId> commits = ui.getVcsLog().getSelectedCommits();
if (filePath.isDirectory()) {
if (commits.size() != 1) return;
}
else {
if (commits.size() != 1 && commits.size() != 2) return;
}
if (commits.size() != 1 && commits.size() != 2) return;
VirtualFile root = commits.get(0).getRoot();
VcsLogDiffHandler handler = ui.getLogData().getLogProvider(root).getDiffHandler();
if (commits.size() == 2 && handler == null) return;
List<Integer> commitIds = ContainerUtil.map(commits, c -> ui.getLogData().getCommitIndex(c.getHash(), c.getRoot()));
ui.getLogData().getCommitDetailsGetter().loadCommitsData(commitIds, details -> {
if (details.size() == 2) {
VcsFileRevision newestRevision = ui.createRevision(details.get(0));
VcsFileRevision olderRevision = ui.createRevision(details.get(1));
if (olderRevision != null && newestRevision != null) {
myDiffHandler.showDiffForTwo(project, filePath, olderRevision, newestRevision);
}
// we only need details here to get file names for each revision
// in order to fix this FileNamesData should be refactored
// so that it could return a single file path for each revision
VcsFullCommitDetails newestDetail = details.get(0);
VcsFullCommitDetails olderDetail = details.get(1);
ProgressIndicator indicator = ui.getLogData().getProgress().createProgressIndicator(true);
ProgressManager.getInstance()
.runProcessWithProgressAsynchronously(new Task.Backgroundable(project, "Comparing Revisions...", false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
try {
notNull(handler).showDiff(root, ui.getPath(olderDetail), olderDetail.getId(), ui.getPath(newestDetail), newestDetail.getId());
}
catch (VcsException e1) {
VcsBalloonProblemNotifier.showOverVersionControlView(project, "Could not compare revisions " +
olderDetail.getId().asString() +
" and " +
newestDetail.getId().asString() +
"\n" +
e1.getMessage(), MessageType.ERROR);
}
}
}, indicator);
}
else if (details.size() == 1) {
VcsFullCommitDetails detail = ObjectUtils.notNull(ContainerUtil.getFirstItem(details));
VcsFullCommitDetails detail = notNull(ContainerUtil.getFirstItem(details));
List<Change> changes = ui.collectRelevantChanges(detail);
if (filePath.isDirectory()) {
VcsDiffUtil.showChangesDialog(project, "Changes in " + detail.getId().toShortString() + " for " + filePath.getName(),