Search in sources :

Example 1 with SvnBranchConfigurationManager

use of org.jetbrains.idea.svn.branchConfig.SvnBranchConfigurationManager in project intellij-community by JetBrains.

the class SvnQuickMergeTest method setUp.

@Override
@Before
public void setUp() throws Exception {
    super.setUp();
    myVcs = SvnVcs.getInstance(myProject);
    myChangeListManager = ChangeListManager.getInstance(myProject);
    myBranchUrl = prepareBranchesStructure();
    myBranchRoot = new File(myTempDirFixture.getTempDirPath(), "b1");
    runInAndVerifyIgnoreOutput("co", myBranchUrl, myBranchRoot.getPath());
    Assert.assertTrue(myBranchRoot.exists());
    myBranchVf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(myBranchRoot);
    Assert.assertNotNull(myBranchVf);
    myBranchTree = new SubTree(myBranchVf);
    myTree = new SubTree(myWorkingCopyDir);
    final SvnBranchConfigurationManager branchConfigurationManager = SvnBranchConfigurationManager.getInstance(myProject);
    final SvnBranchConfigurationNew configuration = new SvnBranchConfigurationNew();
    configuration.setTrunkUrl(myRepoUrl + "/trunk");
    configuration.addBranches(myRepoUrl + "/branches", new InfoStorage<>(new ArrayList<>(), InfoReliability.empty));
    branchConfigurationManager.setConfiguration(myWorkingCopyDir, configuration);
    //((ApplicationImpl) ApplicationManager.getApplication()).setRunPooledInTest(true);
    runInAndVerifyIgnoreOutput(virtualToIoFile(myWorkingCopyDir), "up");
    Thread.sleep(10);
}
Also used : ArrayList(java.util.ArrayList) VirtualFile(com.intellij.openapi.vfs.VirtualFile) VfsUtilCore.virtualToIoFile(com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile) File(java.io.File) SvnBranchConfigurationNew(org.jetbrains.idea.svn.branchConfig.SvnBranchConfigurationNew) SvnBranchConfigurationManager(org.jetbrains.idea.svn.branchConfig.SvnBranchConfigurationManager) Before(org.junit.Before)

Aggregations

VfsUtilCore.virtualToIoFile (com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile)1 VirtualFile (com.intellij.openapi.vfs.VirtualFile)1 File (java.io.File)1 ArrayList (java.util.ArrayList)1 SvnBranchConfigurationManager (org.jetbrains.idea.svn.branchConfig.SvnBranchConfigurationManager)1 SvnBranchConfigurationNew (org.jetbrains.idea.svn.branchConfig.SvnBranchConfigurationNew)1 Before (org.junit.Before)1