@Test
public void testSimpleNotMerged() throws Exception {
enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
final File trunk = new File(myTempDirFixture.getTempDirPath(), "trunk");
trunk.mkdir();
Thread.sleep(100);
final File folder = new File(trunk, "folder");
folder.mkdir();
Thread.sleep(100);
final File f1 = new File(folder, "f1.txt");
f1.createNewFile();
new File(folder, "f2.txt").createNewFile();
Thread.sleep(100);
verify(runSvn("import", "-m", "test", trunk.getAbsolutePath(), myRepoUrl + "/trunk"));
verify(runSvn("copy", "-m", "test", myRepoUrl + "/trunk", myRepoUrl + "/branch"));
FileUtil.delete(trunk);
verify(runSvn("co", myRepoUrl + "/trunk", trunk.getAbsolutePath()));
verify(runSvn("co", myRepoUrl + "/branch", myBranchVcsRoot.getAbsolutePath()));
// rev 3
final VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(f1);
editFileInCommand(myProject, vf, "123\n456\n123");
Thread.sleep(100);
verify(runSvn("ci", "-m", "test", trunk.getAbsolutePath()));
final SvnVcs vcs = SvnVcs.getInstance(myProject);
final CommittedChangesProvider<SvnChangeList, ChangeBrowserSettings> committedChangesProvider =
vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(
committedChangesProvider.createDefaultSettings(),
new SvnRepositoryLocation(myRepoUrl + "/trunk"),
0);
final SvnChangeList changeList = changeListList.get(0);
final BranchInfo branchInfo =
new BranchInfo(
vcs,
myRepoUrl,
myRepoUrl + "/branch",
myRepoUrl + "/trunk",
myRepoUrl + "/trunk",
vcs.createWCClient());
final SvnMergeInfoCache.MergeCheckResult result =
branchInfo.checkList(changeList, myBranchVcsRoot.getAbsolutePath());
assert SvnMergeInfoCache.MergeCheckResult.NOT_MERGED.equals(result);
}
@Test
public void testSimpleMerged() throws Exception {
enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
final File trunk = new File(myTempDirFixture.getTempDirPath(), "trunk");
trunk.mkdir();
Thread.sleep(100);
final File folder = new File(trunk, "folder");
folder.mkdir();
Thread.sleep(100);
final File f1 = new File(folder, "f1.txt");
f1.createNewFile();
new File(folder, "f2.txt").createNewFile();
Thread.sleep(100);
verify(runSvn("import", "-m", "test", trunk.getAbsolutePath(), myRepoUrl + "/trunk"));
verify(runSvn("copy", "-m", "test", myRepoUrl + "/trunk", myRepoUrl + "/branch"));
FileUtil.delete(trunk);
verify(runSvn("co", myRepoUrl + "/trunk", trunk.getAbsolutePath()));
verify(runSvn("co", myRepoUrl + "/branch", myBranchVcsRoot.getAbsolutePath()));
// rev 3
final VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(f1);
editFileInCommand(myProject, vf, "123\n456\n123");
Thread.sleep(100);
verify(runSvn("ci", "-m", "test", trunk.getAbsolutePath()));
// rev 4: record as merged into branch
verify(
runSvn(
"merge",
"-c",
"3",
myRepoUrl + "/trunk",
myBranchVcsRoot.getAbsolutePath(),
"--record-only"));
Thread.sleep(100);
verify(runSvn("ci", "-m", "test", myBranchVcsRoot.getAbsolutePath()));
Thread.sleep(100);
verify(runSvn("up", myBranchVcsRoot.getAbsolutePath()));
final SvnVcs vcs = SvnVcs.getInstance(myProject);
final SVNWCClient wcClient = vcs.createWCClient();
final SVNPropertyData data =
wcClient.doGetProperty(
myBranchVcsRoot, "svn:mergeinfo", SVNRevision.UNDEFINED, SVNRevision.WORKING);
assert data != null
&& data.getValue() != null
&& "/trunk:3".equals(data.getValue().getString());
final CommittedChangesProvider<SvnChangeList, ChangeBrowserSettings> committedChangesProvider =
vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(
committedChangesProvider.createDefaultSettings(),
new SvnRepositoryLocation(myRepoUrl + "/trunk"),
0);
final SvnChangeList changeList = changeListList.get(0);
final String encodedRepoUrl = SVNURL.parseURIDecoded(myRepoUrl).toString();
final BranchInfo branchInfo =
new BranchInfo(
vcs,
encodedRepoUrl,
encodedRepoUrl + "/branch",
encodedRepoUrl + "/trunk",
encodedRepoUrl + "/trunk",
vcs.createWCClient());
final SvnMergeInfoCache.MergeCheckResult result =
branchInfo.checkList(changeList, myBranchVcsRoot.getAbsolutePath());
assert SvnMergeInfoCache.MergeCheckResult.MERGED.equals(result);
}
@Test
public void testWhenInfoInRepo() throws Exception {
enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
final File fullBranch = new File(myTempDirFixture.getTempDirPath(), "fullBranch");
fullBranch.mkdir();
final File trunk = new File(myTempDirFixture.getTempDirPath(), "trunk");
trunk.mkdir();
Thread.sleep(100);
final File folder = new File(trunk, "folder");
folder.mkdir();
Thread.sleep(100);
final File f1 = new File(folder, "f1.txt");
f1.createNewFile();
// this will be taken as branch wc root
final File folder1 = new File(folder, "folder1");
folder1.mkdir();
final File f2 = new File(folder1, "f2.txt");
f2.createNewFile();
Thread.sleep(100);
verify(runSvn("import", "-m", "test", trunk.getAbsolutePath(), myRepoUrl + "/trunk"));
verify(runSvn("copy", "-m", "test", myRepoUrl + "/trunk", myRepoUrl + "/branch"));
FileUtil.delete(trunk);
verify(runSvn("co", myRepoUrl + "/trunk", trunk.getAbsolutePath()));
verify(runSvn("co", myRepoUrl + "/branch", fullBranch.getAbsolutePath()));
verify(runSvn("co", myRepoUrl + "/branch/folder/folder1", myBranchVcsRoot.getAbsolutePath()));
// rev 3 : f2 changed
final VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(f2);
editFileInCommand(myProject, vf, "123\n456\n123");
Thread.sleep(100);
verify(runSvn("ci", "-m", "test", trunk.getAbsolutePath()));
// rev 4: record as merged into branch using full branch WC
verify(
runSvn(
"merge",
"-c",
"3",
myRepoUrl + "/trunk",
fullBranch.getAbsolutePath(),
"--record-only"));
Thread.sleep(100);
verify(runSvn("ci", "-m", "test", fullBranch.getAbsolutePath()));
Thread.sleep(100);
verify(runSvn("up", myBranchVcsRoot.getAbsolutePath()));
final SvnVcs vcs = SvnVcs.getInstance(myProject);
final CommittedChangesProvider<SvnChangeList, ChangeBrowserSettings> committedChangesProvider =
vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(
committedChangesProvider.createDefaultSettings(),
new SvnRepositoryLocation(myRepoUrl + "/trunk"),
0);
final SvnChangeList changeList3 = changeListList.get(0);
assert changeList3.getNumber() == 3;
final String encodedRepoUrl = SVNURL.parseURIDecoded(myRepoUrl).toString();
final BranchInfo branchInfo =
new BranchInfo(
vcs,
encodedRepoUrl,
encodedRepoUrl + "/branch",
encodedRepoUrl + "/trunk",
encodedRepoUrl + "/trunk",
vcs.createWCClient());
SvnMergeInfoCache.MergeCheckResult result =
branchInfo.checkList(changeList3, myBranchVcsRoot.getAbsolutePath());
assert SvnMergeInfoCache.MergeCheckResult.MERGED.equals(result);
}
