Mercurial > hg > mercurial

changeset 696:a07f685ce394

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of depricated getCurrentVersion() method
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 27 Dec 2013 19:10:48 +0100
parents 5164285ece2b
children d1469a7cc038 68251dea7eae
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java
diffstat 5 files changed, 20 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java	Thu Dec 19 19:27:07 2013 +0100
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java	Fri Dec 27 19:10:48 2013 +0100
@@ -103,7 +103,11 @@
                                                @NotNull CheckoutRules checkoutRules) throws VcsException {
     HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(toRoot);
     myVcs.syncRepository(hgRoot);
-    String toRevision = toRootRevision != null ? toRootRevision : myVcs.getCurrentVersion(toRoot);
+    String toRevision = toRootRevision;
+    if (toRevision == null) {
+      RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(toRoot);
+      toRevision = state.getBranchRevisions().get(state.getDefaultBranchName());
+    }
     String mergeBase = getMergeBase(hgRoot, fromRootRevision, toRevision);
     if (mergeBase == null)
       return Collections.emptyList();
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu Dec 19 19:27:07 2013 +0100
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Fri Dec 27 19:10:48 2013 +0100
@@ -169,18 +169,6 @@
     return "mercurialSettings.jsp";
   }
 
-  @NotNull
-  public String getCurrentVersion(@NotNull final VcsRoot root) throws VcsException {
-    HgVcsRoot hgRoot = myHgVcsRootFactory.createHgRoot(root);
-    syncRepository(hgRoot);
-    HgRepo repo = createRepo(hgRoot);
-    Map<String, String> result = repo.branches().call();
-    String revision = result.get(hgRoot.getBranchName());
-    if (revision == null)
-      throw new VcsException("Unable to find current version for the branch: " + hgRoot.getBranchName());
-    return revision;
-  }
-
   public boolean sourcesUpdatePossibleIfChangesNotFound(@NotNull final VcsRoot root) {
     return false;
   }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Dec 19 19:27:07 2013 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Fri Dec 27 19:10:48 2013 +0100
@@ -68,12 +68,15 @@
   public void test_get_current_version() throws Exception {
     VcsRootImpl vcsRoot = createVcsRoot(simpleRepo());
 
-    assertEquals(myVcs.getCurrentVersion(vcsRoot), "9c6a6b4aede0");
+    RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(vcsRoot);
+    assertEquals(state.getBranchRevisions().get(state.getDefaultBranchName()), "9c6a6b4aede0");
     assertEquals("9c6a6b4aede0", myVcs.getVersionDisplayName("10:9c6a6b4aede0", vcsRoot));
 
-    assertEquals(myVcs.getCurrentVersion(createVcsRoot(simpleRepo(), "test_branch")), "04c3ae4c6312");
+    state = myVcs.getCollectChangesPolicy().getCurrentState(createVcsRoot(simpleRepo(), "test_branch"));
+    assertEquals(state.getBranchRevisions().get(state.getDefaultBranchName()), "04c3ae4c6312");
 
-    assertEquals(myVcs.getCurrentVersion(createVcsRoot(simpleRepo(), "name with space")), "9babcf2d5705");
+    state = myVcs.getCollectChangesPolicy().getCurrentState(createVcsRoot(simpleRepo(), "name with space"));
+    assertEquals(state.getBranchRevisions().get(state.getDefaultBranchName()), "9babcf2d5705");
   }
 
   private List<ModificationData> collectChanges(@NotNull VcsRoot vcsRoot, @NotNull String from, @NotNull String to, @NotNull CheckoutRules rules) throws VcsException {
@@ -309,7 +312,8 @@
 
     myVcs.label("tag_by_specified_user", "10:9c6a6b4aede0", root, CheckoutRules.DEFAULT);
 
-    String currentVersion = myVcs.getCurrentVersion(root);
+    RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(root);
+    String currentVersion = state.getBranchRevisions().get(state.getDefaultBranchName());
     List<ModificationData> changes = myVcs.getCollectChangesPolicy().collectChanges(root, "10:9c6a6b4aede0", currentVersion, CheckoutRules.DEFAULT);
     assertEquals(changes.size(), 1);
     assertEquals(changes.get(0).getUserName(), customUserForTag);
@@ -346,7 +350,7 @@
 
   public void labeling_should_not_populate_files_in_local_mirror() throws Exception {
     VcsRootImpl root = createVcsRoot(simpleRepo());
-    myVcs.getCurrentVersion(root);
+    myVcs.getCollectChangesPolicy().getCurrentState(root);
     File mirror = myVcs.getMirrorManager().getMirrorDir(root.getProperty(Constants.REPOSITORY_PROP));
     File[] files = mirror.listFiles();
     assertEquals(files.length, 1);
@@ -560,7 +564,7 @@
     VcsRootImpl vcsRoot = createVcsRoot(simpleRepo());
     File cloneDir = myTempFiles.createTempDir();
     vcsRoot.addProperty(Constants.SERVER_CLONE_PATH_PROP, cloneDir.getAbsolutePath());
-    myVcs.getCurrentVersion(vcsRoot);
+    myVcs.getCollectChangesPolicy().getCurrentState(vcsRoot);
   }
 
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java	Thu Dec 19 19:27:07 2013 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/RevisionFormatTest.java	Fri Dec 27 19:10:48 2013 +0100
@@ -86,7 +86,8 @@
 
 
   public void should_not_include_revnum_in_current_version() throws VcsException {
-    String currentVersion = myVcs.getCurrentVersion(myRoot);
+    RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(myRoot);
+    String currentVersion = state.getBranchRevisions().get(state.getDefaultBranchName());
     assertFalse(currentVersion.contains(":"));
   }
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java	Thu Dec 19 19:27:07 2013 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java	Fri Dec 27 19:10:48 2013 +0100
@@ -2,6 +2,7 @@
 
 import jetbrains.buildServer.util.FileUtil;
 import jetbrains.buildServer.vcs.CheckoutRules;
+import jetbrains.buildServer.vcs.RepositoryStateData;
 import jetbrains.buildServer.vcs.VcsException;
 import jetbrains.buildServer.vcs.impl.VcsRootImpl;
 import org.jetbrains.annotations.NotNull;
@@ -59,7 +60,8 @@
 
 
   private String syncRepository() throws VcsException {
-    return myVcs.getCurrentVersion(myRoot);
+    RepositoryStateData state = myVcs.getCollectChangesPolicy().getCurrentState(myRoot);
+    return state.getBranchRevisions().get(state.getDefaultBranchName());
   }
 
   private void repositoryBecamesUnrelated() throws IOException {