Mercurial > hg > mercurial
changeset 942:944ccd758a6f
Remove ChangesInfoBuilder implementation, it is not used anymore
author | Dmitry Neverov <dmitry.neverov@gmail.com> |
---|---|
date | Thu, 24 Dec 2015 15:52:38 +0100 |
parents | 3a0adb764580 |
children | 07a7f22d8954 |
files | .idea/encodings.xml mercurial-server/src/META-INF/build-server-plugin-mercurial.xml mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilder.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilderTest.java mercurial-tests/src/testng-via-cmd.xml mercurial-tests/src/testng.xml |
diffstat | 6 files changed, 4 insertions(+), 206 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/encodings.xml Thu Dec 10 17:35:28 2015 +0100 +++ b/.idea/encodings.xml Thu Dec 24 15:52:38 2015 +0100 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> -</project> - + <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false"> + <file url="PROJECT" charset="UTF-8" /> + </component> +</project> \ No newline at end of file
--- a/mercurial-server/src/META-INF/build-server-plugin-mercurial.xml Thu Dec 10 17:35:28 2015 +0100 +++ b/mercurial-server/src/META-INF/build-server-plugin-mercurial.xml Thu Dec 24 15:52:38 2015 +0100 @@ -31,7 +31,6 @@ <bean id="commitSupport" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialCommitSupport"/> <bean class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialCommitsInfoBuilderSupport"/> - <bean class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialModificationInfoBuilder"/> <bean class="jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandSettingsForRootImpl"/> <bean class="jetbrains.buildServer.buildTriggers.vcs.mercurial.command.ExtensionsWeaver"/>
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilder.java Thu Dec 10 17:35:28 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package jetbrains.buildServer.buildTriggers.vcs.mercurial; - -import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.ChangeSet; -import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.HgVcsRoot; -import jetbrains.buildServer.vcs.*; -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; -import java.util.Collections; - -public class MercurialModificationInfoBuilder implements ChangesInfoBuilder, MercurialServerExtension { - - private final MercurialVcsSupport myVcs; - private final HgVcsRootFactory myHgVcsRootFactory; - private final RepoFactory myRepoFactory; - private final HgPathProvider myHgPathProvider; - - public MercurialModificationInfoBuilder(@NotNull MercurialVcsSupport vcs, - @NotNull HgVcsRootFactory hgVcsRootFactory, - @NotNull RepoFactory repoFactory, - @NotNull HgPathProvider hgPathProvider) { - myVcs = vcs; - myHgVcsRootFactory = hgVcsRootFactory; - myRepoFactory = repoFactory; - myHgPathProvider = hgPathProvider; - myVcs.addExtension(this); - } - - public void fetchChangesInfo(@NotNull final VcsRoot root, - @NotNull final CheckoutRules checkoutRules, - @NotNull final Collection<String> revisions, - @NotNull final ChangesConsumer consumer) throws VcsException { - final HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(root); - - final CollectChangesContext ctx = new CollectChangesContext(myVcs, - myRepoFactory, - MercurialProgress.NO_OP, - Collections.<String>emptyList()); - - //TODO: it's better if we call log command once (or by chunks) instead of simple for-each - for (String commitId : revisions) { - for (ChangeSet set : myVcs.createRepo(hgRoot).log().withRevsets(commitId).call()) { - consumer.consumeChange(ModificationDataFactory.createModificationData(ctx, set, root, checkoutRules)); - } - } - } -}
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialModificationInfoBuilderTest.java Thu Dec 10 17:35:28 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,137 +0,0 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package jetbrains.buildServer.buildTriggers.vcs.mercurial; - -import jetbrains.buildServer.vcs.ChangesConsumer; -import jetbrains.buildServer.vcs.CheckoutRules; -import jetbrains.buildServer.vcs.VcsRoot; -import jetbrains.vcs.api.ChangeData; -import org.jetbrains.annotations.NotNull; -import org.testng.Assert; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialSupportBuilder.mercurialSupport; -import static jetbrains.buildServer.buildTriggers.vcs.mercurial.ServerPluginConfigBuilder.serverPluginConfig; -import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot; -import static org.testng.AssertJUnit.assertEquals; - -@RequiredHgVersion(min = "1.7.0") -@Test(dataProviderClass = HgVersionConstraint.class, dataProvider = "installedHgVersion") -public class MercurialModificationInfoBuilderTest extends BaseMercurialTestCase { - - private File myRemoteRepository; - private MercurialModificationInfoBuilder myModInfoBuilder; - private MercurialVcsSupport myVcs; - - @BeforeMethod - public void setUp() throws Exception { - super.setUp(); - ServerPluginConfig config = serverPluginConfig() - .cachesDir(myTempFiles.createTempDir()) - .hgPath(Util.getHgPath()) - .build(); - - myRemoteRepository = myTempFiles.createTempDir(); - Util.copyRepository(new File("mercurial-tests/testData/rep2"), myRemoteRepository); - MercurialSupportBuilder hgBuilder = mercurialSupport().withConfig(config); - MercurialVcsSupport vcs = hgBuilder.build(); - myVcs = vcs; - myModInfoBuilder = new MercurialModificationInfoBuilder(vcs, hgBuilder.getHgRootFactory(), hgBuilder.getHgRepoFactory(), hgBuilder.getHgPathProvider()); - } - - - public void should_return_commits_for_every_revision_in_state(HgVersion _) throws Exception { - VcsRoot root = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); - final List<ChangeData> changes = new ArrayList<ChangeData>(); - myVcs.syncRepository(root); - myModInfoBuilder.fetchChangesInfo(root, CheckoutRules.DEFAULT, Arrays.asList("505c5b9d01e6", "9ec402c74298"), new ChangesConsumer() { - public void consumeChange(@NotNull ChangeData change) { - changes.add(change); - } - }); - - for (ChangeData change : changes) { - if (change.getVersion().equals("505c5b9d01e6")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("78e67807f916")); - } else if (change.getVersion().equals("9ec402c74298")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("96b78d73081d")); - } else { - Assert.fail("Unexpected revision: " + change.getVersion()); - } - } - - assertEquals(2, changes.size()); - } - - - public void should_return_commits_for_every_revision_in_state_parent_child(HgVersion _) throws Exception { - VcsRoot root = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); - final List<ChangeData> changes = new ArrayList<ChangeData>(); - myVcs.syncRepository(root); - myModInfoBuilder.fetchChangesInfo(root, CheckoutRules.DEFAULT, Arrays.asList("505c5b9d01e6", "9ec402c74298", "96b78d73081d"), new ChangesConsumer() { - public void consumeChange(@NotNull ChangeData change) { - changes.add(change); - } - }); - - for (ChangeData change : changes) { - if (change.getVersion().equals("505c5b9d01e6")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("78e67807f916")); - } else if (change.getVersion().equals("9ec402c74298")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("96b78d73081d")); - } else if (change.getVersion().equals("96b78d73081d")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("dec47d2d49bf")); - } else { - Assert.fail("Unexpected revision: " + change.getVersion()); - } - } - - assertEquals(3, changes.size()); - } - - public void should_return_commits_for_every_revision_in_state_parent_gap_child(HgVersion _) throws Exception { - VcsRoot root = vcsRoot().withUrl(myRemoteRepository.getAbsolutePath()).build(); - final List<ChangeData> changes = new ArrayList<ChangeData>(); - myVcs.syncRepository(root); - myModInfoBuilder.fetchChangesInfo(root, CheckoutRules.DEFAULT, Arrays.asList("505c5b9d01e6", "9ec402c74298", "dec47d2d49bf"), new ChangesConsumer() { - public void consumeChange(@NotNull ChangeData change) { - changes.add(change); - } - }); - - - for (ChangeData change : changes) { - if (change.getVersion().equals("505c5b9d01e6")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("78e67807f916")); - } else if (change.getVersion().equals("9ec402c74298")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("96b78d73081d")); - } else if (change.getVersion().equals("dec47d2d49bf")) { - Assert.assertEquals(change.getParentRevisions(), Arrays.asList("1e620196c4b6")); - } else { - Assert.fail("Unexpected revision: " + change.getVersion()); - } - } - - assertEquals(3, changes.size()); - } -}
--- a/mercurial-tests/src/testng-via-cmd.xml Thu Dec 10 17:35:28 2015 +0100 +++ b/mercurial-tests/src/testng-via-cmd.xml Thu Dec 24 15:52:38 2015 +0100 @@ -38,7 +38,6 @@ <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MergeSupportTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.TagsTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.CommitsInfoBuilderSupportTest"/> - <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialModificationInfoBuilderTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialUrlSupportTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.PurgeTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialCommitSupportTest"/>
--- a/mercurial-tests/src/testng.xml Thu Dec 10 17:35:28 2015 +0100 +++ b/mercurial-tests/src/testng.xml Thu Dec 24 15:52:38 2015 +0100 @@ -52,7 +52,6 @@ <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MergeSupportTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.TagsTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.CommitsInfoBuilderSupportTest"/> - <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialModificationInfoBuilderTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialUrlSupportTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommitsAndMountPointsCommandParserTest"/> <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.PurgeTest"/>