Mercurial > hg > mercurial
changeset 485:774229a5fcd2
fix compilation, update API
author | eugene.petrenko@gmail.com |
---|---|
date | Mon, 01 Oct 2012 20:47:03 +0200 |
parents | 1bee9e7b8a99 |
children | 0633946c76f2 |
files | .idea/libraries/TeamCity_Vcs_Api.xml mercurial-server/mercurial-server.iml mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/mercurial-tests.iml mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java |
diffstat | 6 files changed, 25 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.idea/libraries/TeamCity_Vcs_Api.xml Mon Oct 01 20:47:03 2012 +0200 @@ -0,0 +1,12 @@ +<component name="libraryTable"> + <library name="TeamCity Vcs Api"> + <CLASSES> + <root url="jar://E:/ref/TeamCity.Trunk/devPackage/server-common-api.jar!/" /> + <root url="jar://E:/ref/TeamCity.Trunk/devPackage/server-vcs-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://E:/ref/TeamCity.Trunk/devPackage/src/openApi-source.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file
--- a/mercurial-server/mercurial-server.iml Mon Oct 01 20:41:38 2012 +0200 +++ b/mercurial-server/mercurial-server.iml Mon Oct 01 20:47:03 2012 +0200 @@ -19,6 +19,7 @@ <orderEntry type="library" exported="" name="IDEA-openapi" level="project" /> <orderEntry type="library" exported="" name="Log4j" level="project" /> <orderEntry type="module" module-name="mercurial-common" /> + <orderEntry type="library" name="TeamCity Vcs Api" level="project" /> </component> </module>
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Mon Oct 01 20:41:38 2012 +0200 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Mon Oct 01 20:47:03 2012 +0200 @@ -447,7 +447,7 @@ } @NotNull - public RepositoryState getCurrentState(@NotNull VcsRoot root) throws VcsException { + public RepositoryStateData getCurrentState(@NotNull VcsRoot root) throws VcsException { HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(root); Map<String, String> branchRevisions = getBranchesRevisions(hgRoot); String defaultBranchName = hgRoot.getBranchName(); @@ -457,7 +457,7 @@ e.setRoot(root); throw e; } - return RepositoryStateFactory.createRepositoryState(branchRevisions, defaultBranchName); + return RepositoryStateData.createVersionState(defaultBranchName, branchRevisions); } @NotNull @@ -513,17 +513,17 @@ @NotNull public List<ModificationData> collectChanges(@NotNull VcsRoot fromRoot, - @NotNull RepositoryState fromState, + @NotNull RepositoryStateData fromState, @NotNull VcsRoot toRoot, - @NotNull RepositoryState toState, + @NotNull RepositoryStateData toState, @NotNull CheckoutRules rules) throws VcsException { return collectChanges(toRoot, fromState, toState, rules); } @NotNull public List<ModificationData> collectChanges(@NotNull VcsRoot root, - @NotNull RepositoryState fromState, - @NotNull RepositoryState toState, + @NotNull RepositoryStateData fromState, + @NotNull RepositoryStateData toState, @NotNull CheckoutRules rules) throws VcsException { Set<String> reportedCsetIds = new HashSet<String>(); List<ModificationData> changes = new ArrayList<ModificationData>();
--- a/mercurial-tests/mercurial-tests.iml Mon Oct 01 20:41:38 2012 +0200 +++ b/mercurial-tests/mercurial-tests.iml Mon Oct 01 20:47:03 2012 +0200 @@ -18,6 +18,7 @@ <orderEntry type="library" name="TeamCity-TestsAPI" level="project" /> <orderEntry type="library" name="TeamCity-impl" level="project" /> <orderEntry type="library" name="TeamCityAPI-agent" level="project" /> + <orderEntry type="library" name="TeamCity Vcs Api" level="project" /> </component> </module>
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Oct 01 20:41:38 2012 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Oct 01 20:47:03 2012 +0200 @@ -15,7 +15,6 @@ */ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import com.intellij.execution.configurations.GeneralCommandLine; import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.*; import jetbrains.buildServer.util.TestFor; import jetbrains.buildServer.vcs.*; @@ -39,7 +38,6 @@ import static jetbrains.buildServer.buildTriggers.vcs.mercurial.Util.copyRepository; import static jetbrains.buildServer.buildTriggers.vcs.mercurial.VcsRootBuilder.vcsRoot; import static jetbrains.buildServer.util.Util.map; -import static jetbrains.buildServer.vcs.RepositoryStateFactory.createRepositoryState; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; @@ -574,12 +572,11 @@ assertEquals(russianLocaleVersion, defaultLocaleVersion); } - public void collect_changes_between_states() throws Exception { VcsRootImpl root = createVcsRoot(myRep2Path); List<ModificationData> changes = myVcs.collectChanges(root, - createRepositoryState(map("default", "1e620196c4b6"), "default"), - createRepositoryState(map("default", "505c5b9d01e6", "personal-branch", "96b78d73081d"), "default"), + RepositoryStateData.createVersionState("default", map("default", "1e620196c4b6")), + RepositoryStateData.createVersionState("default", map("default", "505c5b9d01e6", "personal-branch", "96b78d73081d")), CheckoutRules.DEFAULT); assertEquals(changes.size(), 4); assertThat(changes, hasItem(withVersion("dec47d2d49bf"))); @@ -592,8 +589,8 @@ public void collect_changes_between_states_does_not_report_duplicate_changes() throws Exception { VcsRootImpl root = createVcsRoot(myRep2Path); List<ModificationData> changes = myVcs.collectChanges(root, - createRepositoryState(map("default", "8c44244d6645"), "default"), - createRepositoryState(map("default", "505c5b9d01e6", "personal-branch", "9ec402c74298"), "default"), + RepositoryStateData.createVersionState("default", map("default", "8c44244d6645")), + RepositoryStateData.createVersionState("default", map("default", "505c5b9d01e6", "personal-branch", "9ec402c74298")), CheckoutRules.DEFAULT); assertEquals(changes.size(), 8); assertThat(changes, hasItem(withVersion("9ec402c74298")));
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java Mon Oct 01 20:41:38 2012 +0200 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java Mon Oct 01 20:47:03 2012 +0200 @@ -108,7 +108,7 @@ public void should_not_include_revnum_in_current_state() throws VcsException { - RepositoryState state = myVcs.getCurrentState(myRoot); + RepositoryStateData state = myVcs.getCurrentState(myRoot); for (Map.Entry<String, String> entry : state.getBranchRevisions().entrySet()) { String branchName = entry.getKey(); String revision = entry.getKey();