mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-78496 Perforce integration: IntelliJ shows duplicate changelists when changelists are modified outside the IDE
This commit is contained in:
@@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes;
|
||||
|
||||
import com.intellij.openapi.vcs.FileStatus;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.io.File;
|
||||
@@ -42,4 +43,6 @@ public interface ChangeListManagerGate {
|
||||
void setListsToDisappear(final Collection<String> names);
|
||||
FileStatus getStatus(final VirtualFile file);
|
||||
FileStatus getStatus(final File file);
|
||||
|
||||
void setDefaultChangeList(@NotNull String list);
|
||||
}
|
||||
|
||||
@@ -768,6 +768,11 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
|
||||
public FileStatus getStatus(File file) {
|
||||
return myWorker.getStatus(file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDefaultChangeList(@NotNull String list) {
|
||||
myWorker.setDefault(list);
|
||||
}
|
||||
}
|
||||
|
||||
// assumes after revisions are all not null
|
||||
|
||||
+5
@@ -21,6 +21,7 @@ import com.intellij.openapi.vcs.changes.ChangeListManager;
|
||||
import com.intellij.openapi.vcs.changes.ChangeListManagerGate;
|
||||
import com.intellij.openapi.vcs.changes.LocalChangeList;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Collection;
|
||||
@@ -80,4 +81,8 @@ public class MockChangeListManagerGate implements ChangeListManagerGate {
|
||||
public FileStatus getStatus(File file) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDefaultChangeList(@NotNull String list) {
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user