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

svn: Remove not svn items from "SvnVcs.filterUniqueRoots()" results

Browse Source 
IDEA-CR-32834
This commit is contained in:
Konstantin Kolosovsky
2018-05-30 16:22:00 +03:00
parent ab38db48a6
commit 78e79503a2
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+3 -8
View File
@@ -32,7 +32,6 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.newvfs.impl.NullVirtualFile;
import com.intellij.util.Consumer;
import com.intellij.util.ThreeState;
import com.intellij.util.containers.ContainerUtil;
@@ -78,7 +77,6 @@ import java.util.Map;
import java.util.function.Function;
import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
import static com.intellij.util.ObjectUtils.notNull;
import static com.intellij.util.containers.ContainerUtil.*;
import static java.util.Collections.emptyList;
import static java.util.function.Function.identity;
@@ -761,18 +759,15 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
.mapToEntry(
file -> {
RootUrlInfo wcRoot = getSvnFileUrlMapping().getWcRootForFilePath(virtualToIoFile(file));
VirtualFile wcRootFile = wcRoot != null ? wcRoot.getVirtualFile() : SvnUtil.getWorkingCopyRoot(file);
return notNull(wcRootFile, NullVirtualFile.INSTANCE);
return wcRoot != null ? wcRoot.getVirtualFile() : SvnUtil.getWorkingCopyRoot(file);
},
identity())
.nonNullKeys()
.grouping();
return EntryStream.of(byWorkingCopy)
.flatMapToValue((workingCopy, files) -> {
if (!NullVirtualFile.INSTANCE.equals(workingCopy)) {
FilterDescendantVirtualFiles.filter(files);
}
FilterDescendantVirtualFiles.filter(files);
return files.stream();
})
.values()