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-16732 Externally svn switched sources not detected by IDEA

Browse Source
This commit is contained in:
irengrig
2012-12-12 18:49:59 +04:00
parent 522d1dd163
commit d1608349b8
7 changed files with 131 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java
+16 -1
View File
@@ -15,6 +15,8 @@
*/
package org.jetbrains.idea.svn;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
@@ -29,8 +31,12 @@ import java.util.Set;
public class NestedCopiesBuilder implements StatusReceiver {
private final Set<MyPointInfo> mySet;
private final Project myProject;
private final SvnFileUrlMapping myMapping;
public NestedCopiesBuilder() {
public NestedCopiesBuilder(final Project project, final SvnFileUrlMapping mapping) {
myProject = project;
myMapping = mapping;
mySet = new HashSet<MyPointInfo>();
}
@@ -67,6 +73,15 @@ public class NestedCopiesBuilder implements StatusReceiver {
mySet.add(info);
}
@Override
public void bewareRoot(VirtualFile vf, SVNURL url, WorkingCopyFormat copyFormat) {
final File ioFile = new File(vf.getPath());
final RootUrlInfo info = myMapping.getWcRootForFilePath(ioFile);
if (info != null && FileUtil.filesEqual(ioFile, info.getIoFile()) && ! info.getAbsoluteUrlAsUrl().equals(url)) {
SvnVcs.getInstance(myProject).invokeRefreshSvnRoots(true);
}
}
static class MyPointInfo {
private final VirtualFile myFile;
private SVNURL myUrl;
plugins/svn4idea/src/org/jetbrains/idea/svn/StatusReceiver.java
+1 -1
View File
@@ -21,7 +21,6 @@ import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.wc.SVNStatus;
import java.io.File;
import java.util.EventListener;
public interface StatusReceiver extends EventListener {
@@ -29,4 +28,5 @@ public interface StatusReceiver extends EventListener {
void processIgnored(final VirtualFile vFile);
void processUnversioned(final VirtualFile vFile);
void processCopyRoot(VirtualFile file, SVNURL url, WorkingCopyFormat format);
void bewareRoot(VirtualFile vf, SVNURL url, WorkingCopyFormat copyFormat);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class SvnChangeProvider implements ChangeProvider {
final SvnChangeProviderContext context = new SvnChangeProviderContext(myVcs, builder, progress);
final StatusWalkerPartnerImpl partner = new StatusWalkerPartnerImpl(myVcs, progress);
final NestedCopiesBuilder nestedCopiesBuilder = new NestedCopiesBuilder();
final NestedCopiesBuilder nestedCopiesBuilder = new NestedCopiesBuilder(myVcs.getProject(), mySvnFileUrlMapping);
final EventDispatcher<StatusReceiver> statusReceiver = EventDispatcher.create(StatusReceiver.class);
statusReceiver.addListener(context);
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
+4
View File
@@ -73,6 +73,10 @@ class SvnChangeProviderContext implements StatusReceiver {
public void processCopyRoot(VirtualFile file, SVNURL url, WorkingCopyFormat format) {
}
@Override
public void bewareRoot(VirtualFile vf, SVNURL url, WorkingCopyFormat copyFormat) {
}
public ChangelistBuilder getBuilder() {
return myChangelistBuilder;
}
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
+6 -2
View File
@@ -247,9 +247,13 @@ public class SvnRecursiveStatusWalker {
if (SVNStatusType.OBSTRUCTED.equals(status) || SVNStatusType.STATUS_NONE.equals(status)) {
return;
}
if (vf != null && myCurrentItem.isIsInnerCopyRoot()) {
myReceiver.processCopyRoot(vf, statusInner.getURL(),
if (vf != null) {
if (myCurrentItem.isIsInnerCopyRoot()) {
myReceiver.processCopyRoot(vf, statusInner.getURL(),
WorkingCopyFormat.getInstance(statusInner.getWorkingCopyFormat()));
} else {
myReceiver.bewareRoot(vf, statusInner.getURL(), WorkingCopyFormat.getInstance(statusInner.getWorkingCopyFormat()));
}
}
}
}
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalCommitNoticedTest.java
+51
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.idea.svn;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.VcsConfiguration;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
@@ -27,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import java.io.File;
import java.util.List;
/**
* Created with IntelliJ IDEA.
@@ -107,6 +109,55 @@ public class SvnExternalCommitNoticedTest extends Svn17TestCase {
Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size());
}
@Test
public void testExternalSwitch() throws Exception {
final String branchUrl = prepareBranchesStructure();
final SubTree tree = new SubTree(myWorkingCopyDir);
verify(runSvn("switch", branchUrl + "/root/source/s1.txt", tree.myS1File.getPath()));
verify(runSvn("switch", branchUrl + "/root/target", tree.myTargetDir.getPath()));
myWorkingCopyDir.refresh(false, true);
imitateEvent(myWorkingCopyDir);
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myS1File));
Assert.assertEquals(FileStatus.NOT_CHANGED, clManager.getStatus(tree.myS2File));
Assert.assertEquals(FileStatus.NOT_CHANGED, clManager.getStatus(tree.mySourceDir));
Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myTargetDir));
Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myTargetFiles.get(1)));
}
@Test
public void testExternalRootSwitch() throws Exception {
final String branchUrl = prepareBranchesStructure();
final SubTree tree = new SubTree(myWorkingCopyDir);
SvnConfiguration.getInstance(myProject).DETECT_NESTED_COPIES = true;
myVcs.invokeRefreshSvnRoots(false);
clManager.ensureUpToDate(false);
clManager.ensureUpToDate(false);
SvnFileUrlMapping workingCopies = myVcs.getSvnFileUrlMapping();
List<RootUrlInfo> infos = workingCopies.getAllWcInfos();
Assert.assertEquals(1, infos.size());
Assert.assertEquals(myRepoUrl + "/trunk", infos.get(0).getAbsoluteUrl());
verify(runSvn("switch", branchUrl, myWorkingCopyDir.getPath()));
myWorkingCopyDir.refresh(false, true);
imitateEvent(myWorkingCopyDir);
sleep(300);
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
clManager.ensureUpToDate(false); //first run queries one more update
workingCopies = myVcs.getSvnFileUrlMapping();
infos = workingCopies.getAllWcInfos();
Assert.assertEquals(1, infos.size());
Assert.assertEquals(branchUrl, infos.get(0).getAbsoluteUrl());
}
@Test
public void testExternalCommitInExternals() throws Exception {
prepareExternal();
plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnExternalCommitNoticedTest.java
+52 -2
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.idea.svn16;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.VcsConfiguration;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
@@ -22,13 +23,13 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.impl.local.FileWatcher;
import org.jetbrains.idea.svn.Svn17TestCase;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.*;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
import java.util.List;
/**
* Created with IntelliJ IDEA.
@@ -109,6 +110,55 @@ public class SvnExternalCommitNoticedTest extends Svn17TestCase {
Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size());
}
@Test
public void testExternalSwitch() throws Exception {
final String branchUrl = prepareBranchesStructure();
final SubTree tree = new SubTree(myWorkingCopyDir);
verify(runSvn("switch", branchUrl + "/root/source/s1.txt", tree.myS1File.getPath()));
verify(runSvn("switch", branchUrl + "/root/target", tree.myTargetDir.getPath()));
myWorkingCopyDir.refresh(false, true);
imitateEvent(myWorkingCopyDir);
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myS1File));
Assert.assertEquals(FileStatus.NOT_CHANGED, clManager.getStatus(tree.myS2File));
Assert.assertEquals(FileStatus.NOT_CHANGED, clManager.getStatus(tree.mySourceDir));
Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myTargetDir));
Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myTargetFiles.get(1)));
}
@Test
public void testExternalRootSwitch() throws Exception {
final String branchUrl = prepareBranchesStructure();
final SubTree tree = new SubTree(myWorkingCopyDir);
SvnConfiguration.getInstance(myProject).DETECT_NESTED_COPIES = true;
myVcs.invokeRefreshSvnRoots(false);
clManager.ensureUpToDate(false);
clManager.ensureUpToDate(false);
SvnFileUrlMapping workingCopies = myVcs.getSvnFileUrlMapping();
List<RootUrlInfo> infos = workingCopies.getAllWcInfos();
Assert.assertEquals(1, infos.size());
Assert.assertEquals(myRepoUrl + "/trunk", infos.get(0).getAbsoluteUrl());
verify(runSvn("switch", branchUrl, myWorkingCopyDir.getPath()));
myWorkingCopyDir.refresh(false, true);
imitateEvent(myWorkingCopyDir);
sleep(300);
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
clManager.ensureUpToDate(false); //first run queries one more update
workingCopies = myVcs.getSvnFileUrlMapping();
infos = workingCopies.getAllWcInfos();
Assert.assertEquals(1, infos.size());
Assert.assertEquals(branchUrl, infos.get(0).getAbsoluteUrl());
}
@Test
public void testExternalCommitInExternals() throws Exception {
prepareExternal();