IDEA-78496 Perforce integration: IntelliJ shows duplicate changelists when changelists are modified outside the IDE

This commit is contained in:
peter
2012-02-16 18:23:50 +01:00
parent aa6193b5fa
commit 554e2495c8
3 changed files with 13 additions and 0 deletions
@@ -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
@@ -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) {
}
}