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

IDEA-185964 vcs: disable "Added in not active changelist" file status for vcs that support partial changelists

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-02-05 18:56:44 +03:00
parent 1f286ca176
commit 8ff0c669c5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java
+2 -2
View File
@@ -23,7 +23,6 @@ import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
import com.intellij.openapi.vcs.impl.FileStatusProvider;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.JBColor;
import com.intellij.util.ThreeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -62,7 +61,8 @@ public class ChangelistConflictFileStatusProvider implements FileStatusProvider
else if (options.HIGHLIGHT_NON_ACTIVE_CHANGELIST) {
FileStatus status = myChangeListManager.getStatus(virtualFile);
if (status == FileStatus.MODIFIED || status == FileStatus.ADDED) {
if (!myConflictTracker.isFromActiveChangelist(virtualFile)) {
if (myConflictTracker.shouldDetectConflictsFor(virtualFile) &&
!myConflictTracker.isFromActiveChangelist(virtualFile)) {
return status == FileStatus.MODIFIED ? MODIFIED_OUTSIDE : ADDED_OUTSIDE;
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class ChangelistConflictTracker {
return changeList == null || changeList.isDefault();
}
private boolean shouldDetectConflictsFor(@NotNull VirtualFile file) {
public boolean shouldDetectConflictsFor(@NotNull VirtualFile file) {
return !LineStatusTrackerManager.getInstance(myProject).arePartialChangelistsEnabled(file);
}