# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1376495975 -14400
# Node ID e89816840a2e619d6f444947a31c808605a7b7b4
# Parent  83692f82fbb72edf37ada384dbbb82477098800b# Parent  6ed9e0528564077d4004fb2beec966c5192ac4c1
Merge branch Gaya-8.0.x

diff -r 83692f82fbb7 -r e89816840a2e mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Aug 14 11:07:19 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Aug 14 19:59:35 2013 +0400
@@ -533,9 +533,7 @@
 
   @Override
   public boolean allowSourceCaching() {
-    // since a copy of repository for each VCS root is already stored on disk
-    // we do not need separate cache for our patches
-    return false;
+    return myConfig.allowSourceCaching();
   }
 
   public String label(@NotNull String label, @NotNull String version, @NotNull VcsRoot root, @NotNull CheckoutRules checkoutRules) throws VcsException {
diff -r 83692f82fbb7 -r e89816840a2e mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java	Wed Aug 14 11:07:19 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfig.java	Wed Aug 14 19:59:35 2013 +0400
@@ -33,4 +33,6 @@
   public CronExpression getCleanupCronExpression();
 
   public boolean reportSubrepoChangesFileStatus();
+
+  public boolean allowSourceCaching();
 }
diff -r 83692f82fbb7 -r e89816840a2e mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Wed Aug 14 11:07:19 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Wed Aug 14 19:59:35 2013 +0400
@@ -88,4 +88,8 @@
   public boolean reportSubrepoChangesFileStatus() {
     return TeamCityProperties.getBoolean("teamcity.hg.reportSubrepoChangesFileStatus");
   }
+
+  public boolean allowSourceCaching() {
+    return TeamCityProperties.getBoolean("teamcity.hg.allowSourceCaching");
+  }
 }
diff -r 83692f82fbb7 -r e89816840a2e mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java	Wed Aug 14 11:07:19 2013 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigBuilder.java	Wed Aug 14 19:59:35 2013 +0400
@@ -73,6 +73,10 @@
       public boolean reportSubrepoChangesFileStatus() {
         return false;
       }
+
+      public boolean allowSourceCaching() {
+        return false;
+      }
     };
   }