# HG changeset patch # User eugene.petrenko@gmail.com # Date 1380615175 -7200 # Node ID e01fa960244753ddc403db8b411ecd207e713956 # Parent c3c0ebc63d77e7ffafbc589fb1f8d5eff03aa60d switch to new API diff -r c3c0ebc63d77 -r e01fa9602447 mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java --- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java Mon Sep 30 21:26:55 2013 +0200 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCommitsInfoBuilderSupport.java Tue Oct 01 10:12:55 2013 +0200 @@ -4,7 +4,6 @@ import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.ChangeSetRevision; import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.HgVcsRoot; import jetbrains.buildServer.vcs.*; -import jetbrains.vcs.api.CommitInfo; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -31,16 +30,10 @@ myHgVcsRootFactory = vcsRootFactory; } - @NotNull - public List collectCommits(@NotNull VcsRoot root, - @NotNull CheckoutRules rules, - @NotNull RepositoryStateData headState) throws VcsException { - return collectCommits(root, rules); - } @NotNull - public List collectCommits(@NotNull VcsRoot root, - @NotNull CheckoutRules rules) throws VcsException { + public List collectCommits(@NotNull VcsRoot root, + @NotNull CheckoutRules rules) throws VcsException { final HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(root); final ServerHgRepo repo = mySupport.createRepo(hgRoot); mySupport.syncRepository(hgRoot); @@ -54,7 +47,7 @@ if (bean != null) bean.addTag(e.getKey()); } - return new ArrayList(commitToBean.values()); + return new ArrayList(commitToBean.values()); } @NotNull diff -r c3c0ebc63d77 -r e01fa9602447 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Mon Sep 30 21:26:55 2013 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/CommitsInfoBuilderSupportTest.java Tue Oct 01 10:12:55 2013 +0200 @@ -2,6 +2,7 @@ import jetbrains.buildServer.TestLogger; import jetbrains.buildServer.vcs.CheckoutRules; +import jetbrains.buildServer.vcs.CommitDataBean; import jetbrains.buildServer.vcs.VcsException; import jetbrains.buildServer.vcs.VcsRoot; import jetbrains.vcs.api.CommitInfo; @@ -52,7 +53,7 @@ VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); - final List commitInfos = mySupport.collectCommits(root, CheckoutRules.DEFAULT); + final List commitInfos = mySupport.collectCommits(root, CheckoutRules.DEFAULT); Assert.assertFalse(commitInfos.isEmpty()); for (CommitInfo commitInfo : commitInfos) { @@ -88,7 +89,7 @@ VcsRoot root = vcsRoot().withUrl(myRemoteRepo).build(); - final List commitInfos = mySupport.collectCommits(root, CheckoutRules.DEFAULT); + final List commitInfos = mySupport.collectCommits(root, CheckoutRules.DEFAULT); Assert.assertFalse(commitInfos.isEmpty()); for (CommitInfo commitInfo : commitInfos) {