Mercurial > hg > mercurial

changeset 571:c3ec73ac68ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop option teamcity.hg.use.revsets.root.ids. It was introduced for enabling revsets only for some roots, because revsets were suspected of being slow. Turns out slow part is getting changed files from commit, so this option is not needed anymore.
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 18 Mar 2013 17:43:31 +0400
parents 57b85306c377
children 6e5934c81b66
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerHgRepo.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java
diffstat 4 files changed, 1 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerHgRepo.java	Mon Mar 18 12:08:16 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerHgRepo.java	Mon Mar 18 17:43:31 2013 +0400
@@ -5,8 +5,6 @@
 import jetbrains.buildServer.util.graph.DAG;
 import jetbrains.buildServer.util.graph.DAGs;
 import jetbrains.buildServer.vcs.VcsException;
-import jetbrains.buildServer.vcs.VcsRoot;
-import jetbrains.buildServer.vcs.VcsRootInstance;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -62,11 +60,8 @@
 
   @NotNull
   public CollectChangesCommand collectChanges(@NotNull HgVcsRoot root) throws VcsException {
-    if (myConfig.dontUseRevsets()) {
-      if (shouldUseRevsetsFor(root))
-        return new CollectChangesWithRevsets(this);
+    if (myConfig.dontUseRevsets())
       return new CollectChangesNoRevsets(this, myLogNoFilesTemplate);
-    }
 
     HgVersion hgVersion = getHgVersion();
     if (hgVersion.isEqualsOrGreaterThan(REVSET_HG_VERSION)) {
@@ -87,13 +82,6 @@
     return version().call();
   }
 
-  private boolean shouldUseRevsetsFor(@NotNull VcsRoot root) {
-    if (!(root instanceof VcsRootInstance))
-      return false;
-    long parentId = ((VcsRootInstance) root).getParentId();
-    return myConfig.getRevsetParentRootIds().contains(parentId);
-  }
-
   @NotNull
   public DAG<String> loadDag() throws VcsException {
     LoadDagCommand loadDag = new LoadDagCommand(myCommandSettingsFactory.create(), myHgPath, myWorkingDir, myAuthSettings, myDagTemplate);
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java	Mon Mar 18 12:08:16 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java	Mon Mar 18 17:43:31 2013 +0400
@@ -1,6 +1,5 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
@@ -19,9 +18,6 @@
 
   public boolean dontUseRevsets();
 
-  @NotNull
-  Set<Long> getRevsetParentRootIds();
-
   public boolean detectSubrepoChanges();
 
   public boolean bookmarksEnabled();
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Mon Mar 18 12:08:16 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Mon Mar 18 17:43:31 2013 +0400
@@ -2,17 +2,11 @@
 
 import com.intellij.openapi.diagnostic.Logger;
 import jetbrains.buildServer.serverSide.CachePaths;
-import jetbrains.buildServer.serverSide.ServerPaths;
 import jetbrains.buildServer.serverSide.TeamCityProperties;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-import static com.intellij.openapi.util.text.StringUtil.isEmpty;
-import static java.util.Collections.emptySet;
 
 /**
  * @author dmitry.neverov
@@ -56,23 +50,6 @@
     return TeamCityProperties.getInteger("teamcity.hg.maxDagNodesCount", 0);
   }
 
-  @NotNull
-  public Set<Long> getRevsetParentRootIds() {
-    String parentRootIds = TeamCityProperties.getProperty("teamcity.hg.use.revsets.root.ids", "");
-    if (isEmpty(parentRootIds))
-      return emptySet();
-
-    Set<Long> ids = new HashSet<Long>();
-    for (String parentRootId : parentRootIds.split(",")) {
-      try {
-        ids.add(Long.parseLong(parentRootId));
-      } catch (Exception e) {
-        LOG.warn("Cannot parse rootId \"" + parentRootId + "\", ignore it");
-      }
-    }
-    return ids;
-  }
-
   public boolean detectSubrepoChanges() {
     return TeamCityProperties.getBooleanOrTrue("teamcity.hg.detectSubrepoChanges");
   }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java	Mon Mar 18 12:08:16 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java	Mon Mar 18 17:43:31 2013 +0400
@@ -3,8 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * @author dmitry.neverov
@@ -44,11 +42,6 @@
         return myDontUseRevsets;
       }
 
-      @NotNull
-      public Set<Long> getRevsetParentRootIds() {
-        return new HashSet<Long>();
-      }
-
       public boolean detectSubrepoChanges() {
         return myDetectSubrepoChanges;
       }