tikhomirov@660: /* tikhomirov@660: * Copyright (c) 2013 TMate Software Ltd tikhomirov@660: * tikhomirov@660: * This program is free software; you can redistribute it and/or modify tikhomirov@660: * it under the terms of the GNU General Public License as published by tikhomirov@660: * the Free Software Foundation; version 2 of the License. tikhomirov@660: * tikhomirov@660: * This program is distributed in the hope that it will be useful, tikhomirov@660: * but WITHOUT ANY WARRANTY; without even the implied warranty of tikhomirov@660: * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the tikhomirov@660: * GNU General Public License for more details. tikhomirov@660: * tikhomirov@660: * For information on how to redistribute this software under tikhomirov@660: * the terms of a license other than GNU General Public License tikhomirov@660: * contact TMate Software at support@hg4j.com tikhomirov@660: */ tikhomirov@660: package org.tmatesoft.hg.test; tikhomirov@660: tikhomirov@663: import static junit.framework.Assert.assertEquals; tikhomirov@663: import static org.junit.Assert.assertTrue; tikhomirov@660: import static org.tmatesoft.hg.repo.HgRepository.TIP; tikhomirov@660: tikhomirov@660: import java.io.File; tikhomirov@663: import java.util.Collections; tikhomirov@660: import java.util.List; tikhomirov@663: import java.util.Map; tikhomirov@660: tikhomirov@660: import org.junit.Rule; tikhomirov@660: import org.junit.Test; tikhomirov@663: import org.tmatesoft.hg.core.HgAddRemoveCommand; tikhomirov@663: import org.tmatesoft.hg.core.HgCheckoutCommand; tikhomirov@663: import org.tmatesoft.hg.core.HgCommitCommand; tikhomirov@660: import org.tmatesoft.hg.core.HgIncomingCommand; tikhomirov@660: import org.tmatesoft.hg.core.HgPullCommand; tikhomirov@660: import org.tmatesoft.hg.core.Nodeid; tikhomirov@663: import org.tmatesoft.hg.internal.BasicSessionContext; tikhomirov@663: import org.tmatesoft.hg.internal.Internals; tikhomirov@663: import org.tmatesoft.hg.internal.PhasesHelper; tikhomirov@663: import org.tmatesoft.hg.internal.RevisionSet; tikhomirov@663: import org.tmatesoft.hg.repo.HgInternals; tikhomirov@660: import org.tmatesoft.hg.repo.HgLookup; tikhomirov@663: import org.tmatesoft.hg.repo.HgPhase; tikhomirov@660: import org.tmatesoft.hg.repo.HgRemoteRepository; tikhomirov@660: import org.tmatesoft.hg.repo.HgRepository; tikhomirov@663: import org.tmatesoft.hg.util.Path; tikhomirov@660: tikhomirov@660: /** tikhomirov@660: * @author Artem Tikhomirov tikhomirov@660: * @author TMate Software Ltd. tikhomirov@660: */ tikhomirov@660: public class TestPull { tikhomirov@660: tikhomirov@660: @Rule tikhomirov@660: public ErrorCollectorExt errorCollector = new ErrorCollectorExt(); tikhomirov@660: tikhomirov@660: @Test tikhomirov@660: public void testPullToEmpty() throws Exception { tikhomirov@660: File srcRepoLoc = RepoUtils.cloneRepoToTempLocation("test-annotate", "test-pull2empty-src", false); tikhomirov@660: File dstRepoLoc = RepoUtils.initEmptyTempRepo("test-pull2empty-dst"); tikhomirov@660: HgServer server = new HgServer().start(srcRepoLoc); tikhomirov@660: try { tikhomirov@660: final HgLookup hgLookup = new HgLookup(); tikhomirov@660: final HgRemoteRepository srcRemote = hgLookup.detect(server.getURL()); tikhomirov@663: final HgRepository dstRepo = hgLookup.detect(dstRepoLoc); tikhomirov@660: HgPullCommand cmd = new HgPullCommand(dstRepo).source(srcRemote); tikhomirov@660: cmd.execute(); tikhomirov@660: final HgRepository srcRepo = hgLookup.detect(srcRepoLoc); tikhomirov@660: checkRepositoriesAreSame(srcRepo, dstRepo); tikhomirov@660: final List incoming = new HgIncomingCommand(dstRepo).against(srcRemote).executeLite(); tikhomirov@660: errorCollector.assertTrue(incoming.toString(), incoming.isEmpty()); tikhomirov@660: RepoUtils.assertHgVerifyOk(errorCollector, dstRepoLoc); tikhomirov@660: } finally { tikhomirov@660: server.stop(); tikhomirov@660: } tikhomirov@660: } tikhomirov@663: tikhomirov@663: /** tikhomirov@663: * pull comes with 2 changes, one of them with new file tikhomirov@663: */ tikhomirov@663: @Test tikhomirov@663: public void testPullChanges() throws Exception { tikhomirov@663: tikhomirov@663: File srcRepoLoc = RepoUtils.cloneRepoToTempLocation("test-annotate", "test-pull-src", false); tikhomirov@663: File dstRepoLoc = RepoUtils.cloneRepoToTempLocation("test-annotate", "test-pull-dst", false); tikhomirov@663: File f1 = new File(srcRepoLoc, "file1"); tikhomirov@663: assertTrue("[sanity]", f1.canWrite()); tikhomirov@663: final HgLookup hgLookup = new HgLookup(); tikhomirov@663: // add two commits, one with new file at different branch tikhomirov@663: // commit 1 tikhomirov@663: final HgRepository srcRepo = hgLookup.detect(srcRepoLoc); tikhomirov@663: assertEquals("[sanity]", "default", srcRepo.getWorkingCopyBranchName()); tikhomirov@663: RepoUtils.modifyFileAppend(f1, "change1"); tikhomirov@663: HgCommitCommand commitCmd = new HgCommitCommand(srcRepo).message("Commit 1"); tikhomirov@663: assertTrue(commitCmd.execute().isOk()); tikhomirov@663: final Nodeid cmt1 = commitCmd.getCommittedRevision(); tikhomirov@663: // commit 2 tikhomirov@663: new HgCheckoutCommand(srcRepo).changeset(7).clean(true).execute(); tikhomirov@663: assertEquals("[sanity]", "no-merge", srcRepo.getWorkingCopyBranchName()); tikhomirov@663: RepoUtils.createFile(new File(srcRepoLoc, "file-new"), "whatever"); tikhomirov@663: new HgAddRemoveCommand(srcRepo).add(Path.create("file-new")).execute(); tikhomirov@663: commitCmd = new HgCommitCommand(srcRepo).message("Commit 2"); tikhomirov@663: assertTrue(commitCmd.execute().isOk()); tikhomirov@663: final Nodeid cmt2 = commitCmd.getCommittedRevision(); tikhomirov@663: // tikhomirov@663: // pull tikhomirov@663: HgServer server = new HgServer().start(srcRepoLoc); tikhomirov@663: final HgRepository dstRepo = hgLookup.detect(dstRepoLoc); tikhomirov@663: try { tikhomirov@663: final HgRemoteRepository srcRemote = hgLookup.detect(server.getURL()); tikhomirov@663: new HgPullCommand(dstRepo).source(srcRemote).execute(); tikhomirov@663: } finally { tikhomirov@663: server.stop(); tikhomirov@663: } tikhomirov@663: // tikhomirov@663: errorCollector.assertTrue(dstRepo.getChangelog().isKnown(cmt1)); tikhomirov@663: errorCollector.assertTrue(dstRepo.getChangelog().isKnown(cmt2)); tikhomirov@663: checkRepositoriesAreSame(srcRepo, dstRepo); tikhomirov@663: RepoUtils.assertHgVerifyOk(errorCollector, dstRepoLoc); tikhomirov@663: } tikhomirov@660: tikhomirov@663: /** tikhomirov@663: * Add two draft changesets, one child of r8 (local:draft, remote:public) and another tikhomirov@663: * as child of r4 (public), pull and see if 5, 7 and 8 became public, but newly added drafts remained tikhomirov@663: */ tikhomirov@663: @Test tikhomirov@663: public void testPullFromPublishing() throws Exception { tikhomirov@663: // copy, not clone as latter updates phase information tikhomirov@663: File srcRepoLoc = RepoUtils.copyRepoToTempLocation("test-phases", "test-pull-pub-src"); tikhomirov@663: File dstRepoLoc = RepoUtils.copyRepoToTempLocation("test-phases", "test-pull-pub-dst"); tikhomirov@663: File f1 = new File(dstRepoLoc, "hello.c"); tikhomirov@663: assertTrue("[sanity]", f1.canWrite()); tikhomirov@663: final HgLookup hgLookup = new HgLookup(); tikhomirov@663: HgRepository dstRepo = hgLookup.detect(dstRepoLoc); tikhomirov@663: PhasesHelper phaseHelper = new PhasesHelper(HgInternals.getImplementationRepo(dstRepo)); tikhomirov@663: // tikhomirov@663: // new child revision for shared public parent tikhomirov@663: assertEquals(HgPhase.Public, phaseHelper.getPhase(4, null)); tikhomirov@663: new HgCheckoutCommand(dstRepo).changeset(4).clean(true).execute(); tikhomirov@663: RepoUtils.modifyFileAppend(f1, "// aaa"); tikhomirov@663: HgCommitCommand commitCmd = new HgCommitCommand(dstRepo).message("Commit 1"); tikhomirov@663: assertTrue(commitCmd.execute().isOk()); tikhomirov@663: final Nodeid cmt1 = commitCmd.getCommittedRevision(); tikhomirov@663: // tikhomirov@663: // new child rev for parent locally draft, remotely public tikhomirov@663: assertEquals(HgPhase.Draft, phaseHelper.getPhase(5, null)); tikhomirov@663: assertEquals(HgPhase.Draft, phaseHelper.getPhase(7, null)); tikhomirov@663: assertEquals(HgPhase.Draft, phaseHelper.getPhase(8, null)); tikhomirov@663: new HgCheckoutCommand(dstRepo).changeset(8).clean(true).execute(); tikhomirov@663: RepoUtils.modifyFileAppend(f1, "// bbb"); tikhomirov@663: commitCmd = new HgCommitCommand(dstRepo).message("Commit 2"); tikhomirov@663: assertTrue(commitCmd.execute().isOk()); tikhomirov@663: final Nodeid cmt2 = commitCmd.getCommittedRevision(); tikhomirov@663: // both new revisions shall be draft tikhomirov@663: phaseHelper = new PhasesHelper(HgInternals.getImplementationRepo(dstRepo)); // refresh PhasesHelper tikhomirov@663: assertEquals(HgPhase.Draft, phaseHelper.getPhase(dstRepo.getChangelog().getRevisionIndex(cmt1), cmt1)); tikhomirov@663: assertEquals(HgPhase.Draft, phaseHelper.getPhase(dstRepo.getChangelog().getRevisionIndex(cmt2), cmt2)); tikhomirov@663: // tikhomirov@663: tikhomirov@663: HgServer server = new HgServer().publishing(true).start(srcRepoLoc); tikhomirov@663: try { tikhomirov@663: final HgRemoteRepository srcRemote = hgLookup.detect(server.getURL()); tikhomirov@663: new HgPullCommand(dstRepo).source(srcRemote).execute(); tikhomirov@663: } finally { tikhomirov@663: server.stop(); tikhomirov@663: } tikhomirov@663: // refresh PhasesHelper tikhomirov@663: phaseHelper = new PhasesHelper(HgInternals.getImplementationRepo(dstRepo)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Public, phaseHelper.getPhase(5, null)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Public, phaseHelper.getPhase(7, null)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Public, phaseHelper.getPhase(8, null)); tikhomirov@663: // phase of local-only new revisions shall not change tikhomirov@663: errorCollector.assertEquals(HgPhase.Draft, phaseHelper.getPhase(dstRepo.getChangelog().getRevisionIndex(cmt1), cmt1)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Draft, phaseHelper.getPhase(dstRepo.getChangelog().getRevisionIndex(cmt2), cmt2)); tikhomirov@663: } tikhomirov@663: tikhomirov@663: @Test tikhomirov@663: public void testPullFromNonPublishing() throws Exception { tikhomirov@663: // copy, not clone as latter updates phase information tikhomirov@663: File srcRepoLoc = RepoUtils.copyRepoToTempLocation("test-phases", "test-pull-nopub-src"); tikhomirov@663: File dstRepoLoc = RepoUtils.initEmptyTempRepo("test-pull-nopub-dst"); tikhomirov@663: Map props = Collections.singletonMap(Internals.CFG_PROPERTY_CREATE_PHASEROOTS, true); tikhomirov@663: final HgLookup hgLookup = new HgLookup(new BasicSessionContext(props, null)); tikhomirov@663: HgRepository srcRepo = hgLookup.detect(srcRepoLoc); tikhomirov@663: // revisions 6 and 9 are secret, so tikhomirov@663: // index of revisions 4 and 5 won't change, but that of 7 and 8 would tikhomirov@663: Nodeid r7 = srcRepo.getChangelog().getRevision(7); tikhomirov@663: Nodeid r8 = srcRepo.getChangelog().getRevision(8); tikhomirov@663: tikhomirov@663: HgRepository dstRepo = hgLookup.detect(dstRepoLoc); tikhomirov@663: HgServer server = new HgServer().publishing(false).start(srcRepoLoc); tikhomirov@663: try { tikhomirov@663: final HgRemoteRepository srcRemote = hgLookup.detect(server.getURL()); tikhomirov@663: new HgPullCommand(dstRepo).source(srcRemote).execute(); tikhomirov@663: } finally { tikhomirov@663: server.stop(); tikhomirov@663: } tikhomirov@663: PhasesHelper phaseHelper = new PhasesHelper(HgInternals.getImplementationRepo(dstRepo)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Public, phaseHelper.getPhase(4, null)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Draft, phaseHelper.getPhase(5, null)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Draft, phaseHelper.getPhase(dstRepo.getChangelog().getRevisionIndex(r7), r7)); tikhomirov@663: errorCollector.assertEquals(HgPhase.Draft, phaseHelper.getPhase(dstRepo.getChangelog().getRevisionIndex(r8), r8)); tikhomirov@663: final RevisionSet dstSecret = phaseHelper.allSecret(); tikhomirov@663: errorCollector.assertTrue(dstSecret.toString(), dstSecret.isEmpty()); tikhomirov@663: } tikhomirov@660: tikhomirov@660: private void checkRepositoriesAreSame(HgRepository srcRepo, HgRepository dstRepo) { tikhomirov@660: // XXX copy of TestPush#checkRepositoriesAreSame tikhomirov@660: errorCollector.assertEquals(srcRepo.getChangelog().getRevisionCount(), dstRepo.getChangelog().getRevisionCount()); tikhomirov@660: errorCollector.assertEquals(srcRepo.getChangelog().getRevision(0), dstRepo.getChangelog().getRevision(0)); tikhomirov@660: errorCollector.assertEquals(srcRepo.getChangelog().getRevision(TIP), dstRepo.getChangelog().getRevision(TIP)); tikhomirov@660: } tikhomirov@660: }