--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandlineViaFileWrapperWeaver.java	Fri May 30 18:38:47 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandlineViaFileWrapperWeaver.java	Fri May 30 18:42:18 2014 +0200
@@ -17,6 +17,7 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.Constants;
+import jetbrains.buildServer.serverSide.TeamCityProperties;
 import jetbrains.buildServer.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -29,6 +30,8 @@
   @NotNull
   public CommandSettings update(@NotNull HgVcsRoot root, @NotNull CommandSettings settings) {
     final String pass = root.getProperty(Constants.HG_COMMANDLINE_VIA_FILE);
-    return settings.setUseCommandlineViaFileWrapper(!StringUtil.isEmpty(pass));
+    return settings.setUseCommandlineViaFileWrapper(
+            TeamCityProperties.getBoolean("teamcity.mercurial.use.commandline.via.file.wrapper")
+            || !StringUtil.isEmpty(pass));
   }
 }