MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-160774 git: disable the 'Resolve Conflicts' action for non-git conflicts

Browse Source 
GitOrigin-RevId: b8199bf3240aae5b7981f21a623b17743ab71898
This commit is contained in:
Aleksey Pivovarov
2024-08-26 15:38:41 +02:00
committed by intellij-monorepo-bot
parent ee07968f60
commit eb41fec33d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/git4idea/src/git4idea/actions/GitResolveConflictsAction.java
View File

@@ -10,8 +10,10 @@ import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.AbstractVcsHelper;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangesUtil;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
@@ -34,6 +36,8 @@ public class GitResolveConflictsAction extends DumbAwareAction {
Project project = Objects.requireNonNull(event.getProject());
GitVcs vcs = GitVcs.getInstance(project);
ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project);
Set<VirtualFile> conflictedFiles = new TreeSet<>(Comparator.comparing(VirtualFile::getPresentableUrl));
for (Change change : ChangeListManager.getInstance(project).getAllChanges()) {
if (change.getFileStatus() != FileStatus.MERGED_WITH_CONFLICTS) {
@@ -43,13 +47,13 @@ public class GitResolveConflictsAction extends DumbAwareAction {
ContentRevision after = change.getAfterRevision();
if (before != null) {
VirtualFile file = before.getFile().getVirtualFile();
if (file != null) {
if (file != null && vcs.equals(vcsManager.getVcsFor(file))) {
conflictedFiles.add(file);
}
}
if (after != null) {
VirtualFile file = after.getFile().getVirtualFile();
if (file != null) {
if (file != null && vcs.equals(vcsManager.getVcsFor(file))) {
conflictedFiles.add(file);
}
}
@@ -59,8 +63,14 @@ public class GitResolveConflictsAction extends DumbAwareAction {
}
private static boolean isEnabled(@NotNull Project project) {
GitVcs gitVcs = GitVcs.getInstance(project);
ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project);
if (!vcsManager.checkVcsIsActive(gitVcs)) return false;
Collection<Change> changes = ChangeListManager.getInstance(project).getAllChanges();
return ContainerUtil.exists(changes, it -> it.getFileStatus() == FileStatus.MERGED_WITH_CONFLICTS);
return ContainerUtil.exists(changes, it -> it.getFileStatus() == FileStatus.MERGED_WITH_CONFLICTS &&
gitVcs.equals(ChangesUtil.getVcsForChange(it, project)));
}
@Override