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] Compare with Branch for directories

Browse Source 
Reuse GitDiffFromHistoryHandler to display diff for file or directory.
Make hacky revision numbers with human readable revisions (branch names) for file diff.
This commit is contained in:
Kirill Likhodedov
2012-07-26 20:07:16 +04:00
parent 646335cc2c
commit edaff474e8
2 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java
+29 -34
View File
@@ -20,8 +20,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopupFactory;
@@ -30,21 +28,19 @@ import com.intellij.openapi.vcs.FilePathImpl;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.history.CurrentRevision;
import com.intellij.openapi.vcs.history.VcsFileRevision;
import com.intellij.openapi.vcs.history.VcsHistoryUtil;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.components.JBList;
import git4idea.GitBranch;
import git4idea.GitFileRevision;
import git4idea.GitRevisionNumber;
import git4idea.GitUtil;
import git4idea.history.GitDiffFromHistoryHandler;
import git4idea.history.GitHistoryUtils;
import git4idea.repo.GitRepository;
import git4idea.repo.GitRepositoryManager;
import git4idea.util.GitUIUtil;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -132,7 +128,7 @@ public class GitCompareWithBranchAction extends DumbAwareAction {
}
VirtualFile[] vFiles = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY);
if (vFiles == null || vFiles.length != 1 || vFiles[0] == null || vFiles[0].isDirectory()) { // only 1 file for now, not for dirs
if (vFiles == null || vFiles.length != 1 || vFiles[0] == null) { // only 1 file for now
presentation.setEnabled(false);
presentation.setVisible(true);
return;
@@ -175,43 +171,42 @@ public class GitCompareWithBranchAction extends DumbAwareAction {
@Override
public void run() {
new Task.Backgroundable(myProject, "Comparing...") {
@Override public void run(@NotNull ProgressIndicator indicator) {
String branchToCompare = myList.getSelectedValue().toString();
try {
showDiffWithBranch(myProject, myFile, myHead, branchToCompare);
}
catch (VcsException e) {
if (e.getMessage().contains("exists on disk, but not in")) {
fileDoesntExistInBranchError(myProject, myFile, branchToCompare);
} else {
GitUIUtil.notifyError(myProject, "Couldn't compare with branch",
"Couldn't compare file [" + myFile + "] with selected branch [" + myList.getSelectedValue() + "]",
false, e);
}
}
String branchToCompare = myList.getSelectedValue().toString();
try {
showDiffWithBranch(myProject, myFile, myHead, branchToCompare);
}
catch (VcsException e) {
if (e.getMessage().contains("exists on disk, but not in")) {
fileDoesntExistInBranchError(myProject, myFile, branchToCompare);
} else {
GitUIUtil.notifyError(myProject, "Couldn't compare with branch",
String.format("Couldn't compare file [%s] with selected branch [%s]", myFile, myList.getSelectedValue()),
false, e);
}
}.queue();
}
}
private static void showDiffWithBranch(@NotNull Project project, @NotNull VirtualFile file, @NotNull String head, @NotNull String branchToCompare) throws VcsException {
private static void showDiffWithBranch(@NotNull Project project, @NotNull VirtualFile file, @NotNull String head,
@NotNull String branchToCompare) throws VcsException {
final FilePath filePath = new FilePathImpl(file);
final VcsRevisionNumber currentRevisionNumber = GitHistoryUtils.getCurrentRevision(project, filePath, head);
final VcsRevisionNumber compareRevisionNumber = GitHistoryUtils.getCurrentRevision(project, filePath, branchToCompare);
// we could use something like GitRepository#getCurrentRevision here,
// but this way we can easily identify if the file is available in the branch
final GitRevisionNumber currentRevisionNumber = (GitRevisionNumber)GitHistoryUtils.getCurrentRevision(project, filePath, head);
final GitRevisionNumber compareRevisionNumber =
(GitRevisionNumber)GitHistoryUtils.getCurrentRevision(project, filePath, branchToCompare);
if (compareRevisionNumber == null) {
fileDoesntExistInBranchError(project, file, branchToCompare);
return;
}
final VcsFileRevision compareRevision = new GitFileRevision(project, filePath, (GitRevisionNumber)compareRevisionNumber, false);
final String currentTitle = currentRevisionNumber != null ? ((GitRevisionNumber)currentRevisionNumber).getShortRev() + " on " + head : "Local changes on " + head;
final String compareTitle = ((GitRevisionNumber)compareRevisionNumber).getShortRev() + " on " + branchToCompare;
LOG.assertTrue(currentRevisionNumber != null,
String.format("Current revision number is null for file [%s] and branch [%s]", filePath, head));
try {
VcsHistoryUtil.showDiff(project, filePath, new CurrentRevision(file, currentRevisionNumber), compareRevision, currentTitle, compareTitle);
}
catch (IOException e) {
throw new VcsException(String.format("Couldn't show diff for file [%s], head [%s] and branch [%s]", file.getPresentableUrl(), head, branchToCompare), e);
}
// constructing the revision with human readable name (will work for files comparison however).
final VcsFileRevision compareRevision =
new GitFileRevision(project, filePath, new GitRevisionNumber(branchToCompare, compareRevisionNumber.getTimestamp()), false);
CurrentRevision currentRevision = new CurrentRevision(file, new GitRevisionNumber(head, currentRevisionNumber.getTimestamp()));
new GitDiffFromHistoryHandler(project).showDiff(new FilePathImpl(file), compareRevision, currentRevision);
}
private static void fileDoesntExistInBranchError(Project project, VirtualFile file, String branchToCompare) {
plugins/git4idea/src/git4idea/history/GitDiffFromHistoryHandler.java
+2 -2
View File
@@ -64,7 +64,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*
* @author Kirill Likhodedov
*/
class GitDiffFromHistoryHandler implements DiffFromHistoryHandler {
public class GitDiffFromHistoryHandler implements DiffFromHistoryHandler {
private static final Logger LOG = Logger.getInstance(GitDiffFromHistoryHandler.class);
@@ -72,7 +72,7 @@ class GitDiffFromHistoryHandler implements DiffFromHistoryHandler {
@NotNull private final Git myGit;
@NotNull private final GitRepositoryManager myRepositoryManager;
GitDiffFromHistoryHandler(@NotNull Project project) {
public GitDiffFromHistoryHandler(@NotNull Project project) {
myProject = project;
myGit = ServiceManager.getService(project, Git.class);
myRepositoryManager = GitUtil.getRepositoryManager(project);