# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1361453717 -14400
# Node ID dc7aae21ef2305e512b2642570ed17add2ac4f4b
# Parent  1e5b80e2c0239b1258170af929d1f3fc375ddf41
Use single option for subrepo changes

diff -r 1e5b80e2c023 -r dc7aae21ef23 mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java	Thu Feb 21 17:31:17 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java	Thu Feb 21 17:35:17 2013 +0400
@@ -24,7 +24,5 @@
 
   public boolean detectSubrepoChanges();
 
-  public boolean reportSubrepoConfigUpdates();
-
   public boolean bookmarksEnabled();
 }
diff -r 1e5b80e2c023 -r dc7aae21ef23 mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Thu Feb 21 17:31:17 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Thu Feb 21 17:35:17 2013 +0400
@@ -70,11 +70,7 @@
   }
 
   public boolean detectSubrepoChanges() {
-    return false;
-  }
-
-  public boolean reportSubrepoConfigUpdates() {
-    return TeamCityProperties.getBoolean("teamcity.hg.reportSubrepoConfigUpdates");
+    return TeamCityProperties.getBooleanOrTrue("teamcity.hg.detectSubrepoChanges");
   }
 
   public boolean bookmarksEnabled() {
diff -r 1e5b80e2c023 -r dc7aae21ef23 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java	Thu Feb 21 17:31:17 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java	Thu Feb 21 17:35:17 2013 +0400
@@ -16,7 +16,6 @@
   private File myCachesDir;
   private boolean myDontUseRevsets = false;
   private boolean myDetectSubrepoChanges = false;
-  private boolean myReportSubrepoConfigUpdates = false;
 
   @NotNull
   public ServerPluginConfig build() {
@@ -54,10 +53,6 @@
         return myDetectSubrepoChanges;
       }
 
-      public boolean reportSubrepoConfigUpdates() {
-        return myReportSubrepoConfigUpdates;
-      }
-
       public boolean bookmarksEnabled() {
         return true;
       }
@@ -93,9 +88,4 @@
     myDetectSubrepoChanges = doDetect;
     return this;
   }
-
-  public ServerPluginConfigBuilder reportSubrepoConfigUpdates(boolean doReport) {
-    myReportSubrepoConfigUpdates = doReport;
-    return this;
-  }
 }