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-83780 Subversion: nested working copies are detected incorrectly when they are used as same module roots, not separate modules

Browse Source
This commit is contained in:
irengrig
2012-04-03 15:20:09 +04:00
parent 869d9a7343
commit b4f97a5d68
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
+11 -2
View File
@@ -17,6 +17,7 @@ package org.jetbrains.idea.svn;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.FilePathImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.vcsUtil.VcsUtil;
@@ -205,9 +206,17 @@ public class SvnRecursiveStatusWalker {
if ((vFile != null) && myPartner.isExcluded(vFile)) return;
if ((vFile != null) && (SvnVcs.svnStatusIsUnversioned(status))) {
myReceiver.processUnversioned(vFile);
if (vFile.isDirectory()) {
processRecursively(vFile, myCurrentItem.getDepth());
if (myCurrentItem.getPath().getIOFile().equals(ioFile)) {
myReceiver.processUnversioned(vFile);
processRecursively(vFile, myCurrentItem.getDepth());
} else {
final MyItem childItem = new MyItem(myProject, new FilePathImpl(vFile), SVNDepth.INFINITY,
myPartner.createStatusClient(), true);
myQueue.add(childItem);
}
} else {
myReceiver.processUnversioned(vFile);
}
} else {
final FilePath path = VcsUtil.getFilePath(ioFile, status.getKind().equals(SVNNodeKind.DIR));