--- a/build.xml	Wed Feb 15 12:07:12 2012 +0400
+++ b/build.xml	Wed Feb 15 13:23:53 2012 +0400
@@ -1,72 +1,72 @@
-<project name="Mercurial VCS Support" default="dist" basedir=".">
-  <property file="mercurial.properties"/>
-  <import file="mercurial.xml"/>
-
-  <property name="distPath" value="${basedir}/dist"/>
-
-  <property name="plugin.name" value="mercurial"/>
-
-  <property name="build.number" value=""/>
-  <tstamp>
-    <format property="timestamp" pattern="yyyyMMddhhmmss"/>
-  </tstamp>
-  <property name="snapshot.build.number" value="SNAPSHOT-${timestamp}"/>
-  <property name="build.vcs.number" value=""/>
-
-  <condition property="plugin.version" value="${snapshot.build.number}" else="${build.number}">
-    <matches pattern="snapshot-.*" string="${build.number}" casesensitive="false"/>
-  </condition>
-
-  <import file="teamcity-common.xml"/>
-
-  <target name="package" depends="define.version">
-    <package.teamcity.plugin name="${plugin.name}"
-                             server.output="${mercurial-server.output.dir}"
-                             agent.output="${mercurial-agent.output.dir}"
-                             common.output="${mercurial-common.output.dir}"
-                             plugin.descriptor.file="${basedir}/teamcity-plugin.xml"
-                             plugin.version="${plugin.version}"/>
-  </target>
-
-  <target name="define.version" depends="define.version.if.under.teamcity">
-    <tstamp>
-      <format property="current.time" pattern="yyyyMMddHHmm"/>
-    </tstamp>
-    <property name="plugin.version" value="SNAPSHOT-${current.time}"/>
-  </target>
-
-  <target name="define.version.if.under.teamcity" if="build.number">
-    <property name="plugin.version" value="${build.number}"/>
-  </target>
-
-  <target name="dist" depends="check.teamcitydistribution,all,package"/>
-
-  <target name="deploy" depends="dist">
-    <deploy.teamcity.plugin name="${plugin.name}"/>
-  </target>
-
-  <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${basedir}/mercurial-tests/lib/testng-5.7-jdk15.jar"/>
-
-  <path id="tests_classpath">
-    <pathelement location="${agent.home.dir}/lib/runtime-util.jar"/>
-    <pathelement location="${agent.home.dir}/lib/buildServerRuntimeUtil.jar"/>
-    <path refid="mercurial-tests.runtime.module.classpath"/>
-  </path>
-
-  <target name="run-tests" depends="clean, init, compile.module.mercurial-tests">
-    <property name="suspend" value="n"/>
-
-    <testng haltonfailure="no" failureProperty="failure_found" listener="org.testng.reporters.TestHTMLReporter"
-            outputdir="${basedir}/test-output" classpathref="tests_classpath" dumpcommand="true" workingDir="${basedir}">
-
-      <jvmarg value="-ea"/>
-      <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=5555"/>-->
-
-      <sysproperty key="java.awt.headless" value="true"/>
-
-      <xmlfileset dir="${basedir}/mercurial-tests/src">
-        <include name="testng.xml"/>
-      </xmlfileset>
-    </testng>
-  </target>
-</project>
+<project name="Mercurial VCS Support" default="dist" basedir=".">
+  <property file="mercurial.properties"/>
+  <import file="mercurial.xml"/>
+
+  <property name="distPath" value="${basedir}/dist"/>
+
+  <property name="plugin.name" value="mercurial"/>
+
+  <property name="build.number" value=""/>
+  <tstamp>
+    <format property="timestamp" pattern="yyyyMMddhhmmss"/>
+  </tstamp>
+  <property name="snapshot.build.number" value="SNAPSHOT-${timestamp}"/>
+  <property name="build.vcs.number" value=""/>
+
+  <condition property="plugin.version" value="${snapshot.build.number}" else="${build.number}">
+    <matches pattern="snapshot-.*" string="${build.number}" casesensitive="false"/>
+  </condition>
+
+  <import file="teamcity-common.xml"/>
+
+  <target name="package" depends="define.version">
+    <package.teamcity.plugin name="${plugin.name}"
+                             server.output="${mercurial-server.output.dir}"
+                             agent.output="${mercurial-agent.output.dir}"
+                             common.output="${mercurial-common.output.dir}"
+                             plugin.descriptor.file="${basedir}/teamcity-plugin.xml"
+                             plugin.version="${plugin.version}"/>
+  </target>
+
+  <target name="define.version" depends="define.version.if.under.teamcity">
+    <tstamp>
+      <format property="current.time" pattern="yyyyMMddHHmm"/>
+    </tstamp>
+    <property name="plugin.version" value="SNAPSHOT-${current.time}"/>
+  </target>
+
+  <target name="define.version.if.under.teamcity" if="build.number">
+    <property name="plugin.version" value="${build.number}"/>
+  </target>
+
+  <target name="dist" depends="check.teamcitydistribution,all,package"/>
+
+  <target name="deploy" depends="dist">
+    <deploy.teamcity.plugin name="${plugin.name}"/>
+  </target>
+
+  <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${basedir}/mercurial-tests/lib/testng-5.7-jdk15.jar"/>
+
+  <path id="tests_classpath">
+    <pathelement location="${agent.home.dir}/lib/runtime-util.jar"/>
+    <pathelement location="${agent.home.dir}/lib/buildServerRuntimeUtil.jar"/>
+    <path refid="mercurial-tests.runtime.module.classpath"/>
+  </path>
+
+  <target name="run-tests" depends="clean, init, compile.module.mercurial-tests">
+    <property name="suspend" value="n"/>
+
+    <testng haltonfailure="no" failureProperty="failure_found" listener="org.testng.reporters.TestHTMLReporter"
+            outputdir="${basedir}/test-output" classpathref="tests_classpath" dumpcommand="true" workingDir="${basedir}">
+
+      <jvmarg value="-ea"/>
+      <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=5555"/>-->
+
+      <sysproperty key="java.awt.headless" value="true"/>
+
+      <xmlfileset dir="${basedir}/mercurial-tests/src">
+        <include name="testng.xml"/>
+      </xmlfileset>
+    </testng>
+  </target>
+</project>

--- a/mercurial-agent/src/META-INF/build-agent-plugin-mercurial.xml	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-agent/src/META-INF/build-agent-plugin-mercurial.xml	Wed Feb 15 13:23:53 2012 +0400
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans default-autowire="constructor">
-  <bean id="mercurialAgent" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialAgentSideVcsSupport" />
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans default-autowire="constructor">
+  <bean id="mercurialAgent" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialAgentSideVcsSupport" />
+  <bean id="hgPathProvider" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.AgentHgPathProvider" />
+  <bean id="hgDetector" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.HgDetector" />
+  <bean id="pluginConfig" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.AgentPluginConfigImpl"/>
+  <bean id="mirrorManager" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MirrorManagerImpl" />
+</beans>

--- a/mercurial-agent/src/build-agent-plugin.xml	Wed Feb 15 12:07:12 2012 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<!--
-PicoContainer configuration for old fashioned TeamCity agent plugins.
-In TeamCity 4.0 Spring configuration must be created instead.
--->
-<container>
-  <component class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialAgentSideVcsSupport" />
-</container>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentHgPathProvider.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,32 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import jetbrains.buildServer.agent.BuildAgentConfiguration;
+import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.Settings;
+import jetbrains.buildServer.parameters.ProcessingResult;
+import jetbrains.buildServer.parameters.ValueResolver;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author dmitry.neverov
+ */
+public class AgentHgPathProvider implements HgPathProvider {
+
+  private final ValueResolver myResolver;
+
+
+  public AgentHgPathProvider(@NotNull final BuildAgentConfiguration agentConfig) {
+    myResolver = agentConfig.getParametersResolver();
+  }
+
+
+  public String getHgPath(@NotNull final Settings settings) {
+    String pathFromRoot = settings.getHgPath();
+    return resolve(pathFromRoot);
+  }
+
+
+  private String resolve(@NotNull final String value) {
+    ProcessingResult result = myResolver.resolve(value);
+    return result.getResult();
+  }
+}

--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfig.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfig.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,10 +1,14 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
+import jetbrains.buildServer.agent.AgentRunningBuild;
+import org.jetbrains.annotations.NotNull;
+
 /**
  * @author dmitry.neverov
  */
 public interface AgentPluginConfig extends PluginConfig {
 
-  boolean isUseLocalMirrors();
+  boolean isUseLocalMirrors(@NotNull AgentRunningBuild build);
 
+  int getPullTimeout(@NotNull AgentRunningBuild build);
 }

--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfigImpl.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentPluginConfigImpl.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,9 +1,12 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
 import jetbrains.buildServer.agent.AgentRunningBuild;
+import jetbrains.buildServer.agent.BuildAgentConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
+
 /**
  * @author dmitry.neverov
  */
@@ -12,18 +15,23 @@
   private static final String PULL_TIMEOUT_SECONDS = "teamcity.hg.pull.timeout.seconds";
   private final int DEFAULT_PULL_TIMEOUT_SECONDS = 3600;
 
-  private final AgentRunningBuild myBuild;
+  private final BuildAgentConfiguration myAgentConfig;
 
-  public AgentPluginConfigImpl(@NotNull AgentRunningBuild build) {
-    myBuild = build;
+  public AgentPluginConfigImpl(@NotNull BuildAgentConfiguration agentConfig) {
+    myAgentConfig = agentConfig;
   }
 
-  public boolean isUseLocalMirrors() {
-    return "true".equals(myBuild.getSharedConfigParameters().get("teamcity.hg.use.local.mirrors"));
+  public boolean isUseLocalMirrors(@NotNull AgentRunningBuild build) {
+    return "true".equals(build.getSharedConfigParameters().get("teamcity.hg.use.local.mirrors"));
   }
 
-  public int getPullTimeout() {
-    Integer timeout = parseTimeout(myBuild.getSharedConfigParameters().get(PULL_TIMEOUT_SECONDS));
+  @NotNull
+  public File getCachesDir() {
+    return myAgentConfig.getCacheDirectory("mercurial");
+  }
+
+  public int getPullTimeout(@NotNull AgentRunningBuild build) {
+    Integer timeout = parseTimeout(build.getSharedConfigParameters().get(PULL_TIMEOUT_SECONDS));
     if (timeout != null)
       return timeout;
     return DEFAULT_PULL_TIMEOUT_SECONDS;
@@ -38,7 +46,7 @@
       if (timeout > 0)
         return timeout;
       else
-        return null;
+         return null;
     } catch (NumberFormatException e) {
       return null;
     }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgDetector.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,90 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import com.intellij.openapi.diagnostic.Logger;
+import jetbrains.buildServer.agent.AgentLifeCycleAdapter;
+import jetbrains.buildServer.agent.AgentLifeCycleListener;
+import jetbrains.buildServer.agent.BuildAgent;
+import jetbrains.buildServer.agent.BuildAgentConfiguration;
+import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.VersionCommand;
+import jetbrains.buildServer.util.EventDispatcher;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author dmitry.neverov
+ */
+public class HgDetector extends AgentLifeCycleAdapter {
+
+  final static String AGENT_HG_PATH_PROPERTY = "teamcity.hg.agent.path";
+  private final static Logger LOG = Logger.getInstance(HgDetector.class.getName());
+  private final static HgVersion LEAST_SUPPORTED_VERSION = new HgVersion(1, 5, 2);
+  private final List<String> myHgPaths = Arrays.asList("hg");
+
+
+  public HgDetector(@NotNull final EventDispatcher<AgentLifeCycleListener> dispatcher) {
+    dispatcher.addListener(this);
+  }
+
+
+  @Override
+  public void beforeAgentConfigurationLoaded(@NotNull final BuildAgent agent) {
+    BuildAgentConfiguration config = agent.getConfiguration();
+    String agentHgPath = config.getConfigurationParameters().get(AGENT_HG_PATH_PROPERTY);
+    File workDir = config.getTempDirectory();
+    if (agentHgPath == null) {
+      String detectedHg = detectHg(workDir);
+      if (detectedHg != null) {
+        LOG.info("Detect installed mercurial at path " + detectedHg + ", provide it as a property " + AGENT_HG_PATH_PROPERTY);
+        config.addConfigurationParameter(AGENT_HG_PATH_PROPERTY, "hg");
+      } else {
+        LOG.info("Cannot detect installed mercurial");
+      }
+    } else {
+      if (!canRunHg(agentHgPath, workDir, true))
+        LOG.warn("Mercurial executable at path " + agentHgPath + " cannot be run or not compatible with TeamCity");
+    }
+  }
+
+
+  @Nullable
+  private String detectHg(@NotNull final File workDir) {
+    for (String path : myHgPaths) {
+      if (canRunHg(path, workDir))
+        return path;
+    }
+    return null;
+  }
+
+
+  private boolean canRunHg(@NotNull final String hgPath, @NotNull final File workDir) {
+    return canRunHg(hgPath, workDir, false);
+  }
+
+  private boolean canRunHg(@NotNull final String hgPath, @NotNull final File workDir, boolean logWarnings) {
+    VersionCommand versionCommand = new VersionCommand(hgPath, workDir);
+    try {
+      HgVersion version = versionCommand.execute();
+      if (isCompatible(version)) {
+        return true;
+      } else {
+        if (logWarnings)
+          LOG.warn("Mercurial version at path " + hgPath + " is " + version + ", required version is " + LEAST_SUPPORTED_VERSION + "+");
+        return false;
+      }
+    } catch (VcsException e) {
+      if (logWarnings)
+        LOG.warn("Error while trying to get hg version, hg path " + hgPath + ", error: " + e.getMessage());
+      return false;
+    }
+  }
+
+
+  private boolean isCompatible(@NotNull final HgVersion version) {
+    return version.isEqualsOrGreaterThan(LEAST_SUPPORTED_VERSION);
+  }
+}

--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java	Wed Feb 15 13:23:53 2012 +0400
@@ -16,58 +16,33 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
 import jetbrains.buildServer.agent.AgentRunningBuild;
-import jetbrains.buildServer.agent.BuildAgentConfiguration;
-import jetbrains.buildServer.agent.BuildProgressLogger;
 import jetbrains.buildServer.agent.vcs.AgentVcsSupport;
 import jetbrains.buildServer.agent.vcs.IncludeRuleUpdater;
 import jetbrains.buildServer.agent.vcs.UpdateByIncludeRules2;
 import jetbrains.buildServer.agent.vcs.UpdatePolicy;
-import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.*;
-import jetbrains.buildServer.util.FileUtil;
 import jetbrains.buildServer.vcs.CheckoutRules;
-import jetbrains.buildServer.vcs.IncludeRule;
 import jetbrains.buildServer.vcs.VcsException;
 import jetbrains.buildServer.vcs.VcsRoot;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandUtil.removePrivateData;
 
 public class MercurialAgentSideVcsSupport extends AgentVcsSupport implements UpdateByIncludeRules2 {
 
+  private final AgentPluginConfig myConfig;
+  private final HgPathProvider myHgPathProvider;
   private final MirrorManager myMirrorManager;
 
-  public MercurialAgentSideVcsSupport(BuildAgentConfiguration agentConfiguration) {
-    myMirrorManager = new MirrorManager(agentConfiguration.getCacheDirectory("mercurial"));
+  public MercurialAgentSideVcsSupport(@NotNull final AgentPluginConfig pluginConfig,
+                                      @NotNull final HgPathProvider hgPathProvider,
+                                      @NotNull final MirrorManager mirrorManager) {
+    myConfig = pluginConfig;
+    myHgPathProvider = hgPathProvider;
+    myMirrorManager = mirrorManager;
   }
 
   public IncludeRuleUpdater getUpdater(@NotNull final VcsRoot vcsRoot, @NotNull final CheckoutRules checkoutRules, @NotNull final String toVersion, @NotNull final File checkoutDirectory, @NotNull final AgentRunningBuild build, boolean cleanCheckoutRequested) throws VcsException {
-    final AgentPluginConfig config = new AgentPluginConfigImpl(build);
-    final BuildProgressLogger logger = build.getBuildLogger();
-    return new IncludeRuleUpdater() {
-      public void process(@NotNull final IncludeRule includeRule, @NotNull final File workingDir) throws VcsException {
-        try {
-          checkRuleIsValid(includeRule);
-          Settings settings = new Settings(vcsRoot);
-          if (config.isUseLocalMirrors()) {
-            updateLocalMirror(vcsRoot, logger, config);
-          }
-          updateRepository(workingDir, settings, logger, config);
-          updateWorkingDir(settings, workingDir, toVersion, logger);
-        } catch (Exception e) {
-          if (e instanceof VcsException)
-            throw (VcsException) e;
-          else
-            throw new VcsException(e);
-        }
-      }
-
-      public void dispose() throws VcsException {
-      }
-    };
+    return new MercurialIncludeRuleUpdater(myConfig, myMirrorManager, myHgPathProvider, vcsRoot, toVersion, build);
   }
 
   @NotNull
@@ -81,90 +56,4 @@
   public UpdatePolicy getUpdatePolicy() {
     return this;
   }
-
-  private void initRepository(File workingDir, Settings settings, BuildProgressLogger logger, boolean useLocalMirrors) throws VcsException {
-    try {
-      String defaultPullUrl = getDefaultPullUrl(settings, useLocalMirrors);
-      logger.message("Init repository at " + workingDir.getAbsolutePath() + ", remote repository is " +
-              removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword())));
-      new Init(settings, workingDir, defaultPullUrl).execute();
-    } catch (IOException e) {
-      throw new VcsException("Error while initializing repository at " + workingDir.getAbsolutePath(), e);
-    }
-  }
-
-  private void updateRepository(File workingDir, Settings settings, BuildProgressLogger logger, AgentPluginConfig config) throws VcsException, IOException {
-    if (!Settings.isValidRepository(workingDir)) {
-      initRepository(workingDir, settings, logger, config.isUseLocalMirrors());
-    } else {
-      ensureUseRightRepository(workingDir, settings, logger, config.isUseLocalMirrors());
-    }
-    String defaultPullUrl = getDefaultPullUrl(settings, config.isUseLocalMirrors());
-    logger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword())));
-    new PullCommand(settings, workingDir, defaultPullUrl).execute(config.getPullTimeout());
-    logger.message("Changes successfully pulled");
-  }
-
-  private void ensureUseRightRepository(File workingDir, Settings settings, BuildProgressLogger logger, boolean useLocalMirrors) throws VcsException {
-    boolean clonedFromWrongRepository = useLocalMirrors && !isClonedFromLocalMirror(settings, workingDir)
-                                     || !useLocalMirrors && isClonedFromLocalMirror(settings, workingDir);
-
-    if (clonedFromWrongRepository) {
-      String rightRepository = useLocalMirrors ? "local mirror" : "remote repository";
-      String wrongRepository = useLocalMirrors ? "remote repository" : "local mirror";
-      logger.message("Repository in working directory is cloned from " + wrongRepository + ", clone it from " + rightRepository);
-      FileUtil.delete(workingDir);
-      initRepository(workingDir, settings, logger, useLocalMirrors);
-    }
-  }
-
-  private void updateLocalMirror(VcsRoot root, BuildProgressLogger logger, AgentPluginConfig config) throws VcsException, IOException {
-    Settings settings = new Settings(root);
-    File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepositoryUrl());
-    logger.message("Update local mirror at " + mirrorDir);
-    if (!Settings.isValidRepository(mirrorDir)) {
-      initRepository(mirrorDir, settings, logger, false);
-    }
-    final String defaultPullUrl = getDefaultPullUrl(settings, true);
-    logger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword())));
-    new PullCommand(settings, mirrorDir).execute(config.getPullTimeout());
-    logger.message("Local mirror changes successfully pulled");
-  }
-
-  private void updateWorkingDir(final Settings settings, File workingDir, @NotNull final String version, final BuildProgressLogger logger) throws VcsException {
-    logger.message("Updating folder " + workingDir.getAbsolutePath() + " to revision " + version);
-    UpdateCommand uc = new UpdateCommand(settings, workingDir);
-    ChangeSet cs = new ChangeSet(version);
-    uc.setToId(cs.getId());
-    uc.execute();
-    logger.message("Folder successfully updated");
-  }
-
-  private String getDefaultPullUrl(Settings settings, boolean useLocalMirror) throws IOException {
-    if (useLocalMirror) {
-      File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepositoryUrl());
-      return mirrorDir.getCanonicalPath();
-    } else {
-      return settings.getRepositoryUrl();
-    }
-  }
-
-  private void checkRuleIsValid(IncludeRule includeRule) throws VcsException {
-    if (includeRule.getTo() != null && includeRule.getTo().length() > 0) {
-      if (!".".equals(includeRule.getFrom()) && includeRule.getFrom().length() != 0) {
-        throw new VcsException("Invalid include rule: " + includeRule.toString() + ", Mercurial plugin supports mapping of the form: +:.=>dir only.");
-      }
-    }
-  }
-
-  public boolean isClonedFromLocalMirror(Settings settings, File workingDir) {
-    try {
-      File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepositoryUrl());
-      File hgrc = new File(workingDir, ".hg" + File.separator + "hgrc");
-      String config = FileUtil.readText(hgrc);
-      return config.contains("default = " + mirrorDir.getCanonicalPath());
-    } catch (Exception e) {
-      return false;
-    }
-  }
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,335 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import com.intellij.openapi.util.Pair;
+import jetbrains.buildServer.agent.AgentRunningBuild;
+import jetbrains.buildServer.agent.BuildProgressLogger;
+import jetbrains.buildServer.agent.vcs.IncludeRuleUpdater;
+import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.*;
+import jetbrains.buildServer.util.FileUtil;
+import jetbrains.buildServer.vcs.IncludeRule;
+import jetbrains.buildServer.vcs.VcsException;
+import jetbrains.buildServer.vcs.VcsRoot;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.intellij.openapi.util.io.FileUtil.delete;
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandUtil.removePrivateData;
+import static jetbrains.buildServer.util.FileUtil.isEmptyDir;
+
+/**
+ * @author dmitry.neverov
+ */
+public class MercurialIncludeRuleUpdater implements IncludeRuleUpdater {
+
+  private final AgentPluginConfig myConfig;
+  private final MirrorManager myMirrorManager;
+  private final HgPathProvider myHgPathProvider;
+  private final VcsRoot myRoot;
+  private final Settings mySettings;
+  private final String myToVersion;
+  private final BuildProgressLogger myLogger;
+  private final boolean myUseLocalMirrors;
+  private int myPullTimeout;
+
+  public MercurialIncludeRuleUpdater(@NotNull final AgentPluginConfig pluginConfig,
+                                     @NotNull final MirrorManager mirrorManager,
+                                     @NotNull final HgPathProvider hgPathProvider,
+                                     @NotNull final VcsRoot root,
+                                     @NotNull final String toVersion,
+                                     @NotNull final AgentRunningBuild build) {
+    myConfig = pluginConfig;
+    myMirrorManager = mirrorManager;
+    myHgPathProvider = hgPathProvider;
+    myRoot = root;
+    mySettings = new Settings(myHgPathProvider, myRoot);
+    myToVersion = toVersion;
+    myLogger = build.getBuildLogger();
+    myUseLocalMirrors = myConfig.isUseLocalMirrors(build);
+    myPullTimeout = myConfig.getPullTimeout(build);
+  }
+
+
+  public void process(@NotNull IncludeRule rule, @NotNull File workingDir) throws VcsException {
+    try {
+      checkRuleIsValid(rule);
+      if (myUseLocalMirrors)
+        updateLocalMirror();
+      updateRepository(workingDir);
+      updateWorkingDir(workingDir);
+    } catch (Exception e) {
+      throwVcsException(e);
+    }
+  }
+
+
+  public void dispose() throws VcsException {
+  }
+
+
+  private void throwVcsException(Exception e) throws VcsException {
+    if (e instanceof VcsException)
+      throw (VcsException) e;
+    else
+      throw new VcsException(e);
+  }
+
+
+  private void initRepository(Settings settings, File workingDir, boolean useLocalMirrors) throws VcsException {
+    try {
+      String defaultPullUrl = getDefaultPullUrl(settings, useLocalMirrors);
+      myLogger.message("Init repository at " + workingDir.getAbsolutePath() + ", remote repository is " +
+              removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword())));
+      new Init(settings, workingDir, defaultPullUrl).execute();
+    } catch (IOException e) {
+      throw new VcsException("Error while initializing repository at " + workingDir.getAbsolutePath(), e);
+    }
+  }
+
+
+  private void updateRepository(File workingDir) throws VcsException, IOException {
+    String defaultPullUrl = getDefaultPullUrl(mySettings, myUseLocalMirrors);
+    if (isEmptyDir(workingDir)) {
+      workingDir.mkdirs();
+      myLogger.message("Start cloning from " + removePrivateData(defaultPullUrl, Collections.singleton(mySettings.getPassword())));
+      CloneCommand clone = new CloneCommand(mySettings, workingDir);
+      clone.setRepository(defaultPullUrl);
+      clone.setUsePullProtocol(false);
+      clone.setUpdateWorkingDir(false);
+      clone.execute();
+      myLogger.message("Repository successfully cloned");
+    } else {
+      if (!Settings.isValidRepository(workingDir)) {
+        initRepository(mySettings, workingDir, myUseLocalMirrors);
+      } else {
+        ensureUseRightRepository(workingDir);
+      }
+      myLogger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(mySettings.getPassword())));
+      new PullCommand(mySettings, workingDir, defaultPullUrl).execute(myPullTimeout);
+      myLogger.message("Changes successfully pulled");
+    }
+  }
+
+
+  private void ensureUseRightRepository(File workingDir) throws VcsException {
+    boolean clonedFromWrongRepository = myUseLocalMirrors && !isClonedFromLocalMirror(workingDir)
+                                     || !myUseLocalMirrors && isClonedFromLocalMirror(workingDir);
+
+    if (clonedFromWrongRepository) {
+      String rightRepository = myUseLocalMirrors ? "local mirror" : "remote repository";
+      String wrongRepository = myUseLocalMirrors ? "remote repository" : "local mirror";
+      myLogger.message("Repository in working directory is cloned from " + wrongRepository + ", clone it from " + rightRepository);
+      FileUtil.delete(workingDir);
+      initRepository(mySettings, workingDir, myUseLocalMirrors);
+    }
+  }
+
+
+  private void updateLocalMirror() throws VcsException, IOException {
+    Settings settings = new Settings(myHgPathProvider, myRoot);
+    File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepository());
+    myLogger.message("Update local mirror at " + mirrorDir);
+    if (!Settings.isValidRepository(mirrorDir)) {
+      initRepository(settings, mirrorDir, false);
+    }
+    final String defaultPullUrl = getDefaultPullUrl(settings, true);
+    myLogger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(settings.getPassword())));
+    new PullCommand(settings, mirrorDir).execute(myPullTimeout);
+    myLogger.message("Local mirror changes successfully pulled");
+  }
+
+
+  private void updateWorkingDir(@NotNull final File workingDir) throws VcsException, IOException {
+    String workingDirRevision = getWorkingDirRevision(mySettings, workingDir);
+    if (isInitialClone(workingDirRevision)) {
+      doUpdateWorkingDir(workingDir);
+    } else {
+      Map<String, Pair<String, String>> currentSubrepos = getSubrepositories(workingDir, workingDirRevision);
+      if (currentSubrepos.isEmpty()) {
+        doUpdateWorkingDir(workingDir);
+      } else {
+        Map<String, Pair<String, String>> toVersionSubrepos = getSubrepositories(workingDir, myToVersion);
+        Map<String, Pair<String, String>> subrepositoriesWithChangedUrls = getSubrepositoriesWithChangedUrls(currentSubrepos, toVersionSubrepos);
+        if (subrepositoriesWithChangedUrls.isEmpty()) {
+          doUpdateWorkingDir(workingDir);
+        } else {
+          logSubrepositoriesUrlsChanged(workingDirRevision, myToVersion, subrepositoriesWithChangedUrls);
+          FileUtil.delete(workingDir);
+          updateRepository(workingDir);
+          doUpdateWorkingDir(workingDir);
+        }
+      }
+    }
+  }
+
+
+  private void logSubrepositoriesUrlsChanged(@NotNull final String fromVersion,
+                                             @NotNull final String toVersion,
+                                             @NotNull final Map<String, Pair<String, String>> subrepositoriesWithChangedUrls) {
+    StringBuilder sb = new StringBuilder();
+    sb.append("Subrepositories' URLs were changed between revisions ").append(fromVersion).append("..").append(toVersion).append(":\n");
+    for (Map.Entry<String, Pair<String, String>> entry : subrepositoriesWithChangedUrls.entrySet()) {
+      String path = entry.getKey();
+      String oldUrl = entry.getValue().first;
+      String newUrl = entry.getValue().second;
+      sb.append("path: \"").append(path).append("\", old URL: \"").append(oldUrl).append("\", new URL: \"").append(newUrl).append("\";\n");
+    }
+    sb.append("do clean checkout.");
+    myLogger.warning(sb.toString());
+  }
+
+
+  /*returns map: relative path -> (repository url, repository revision)*/
+  private Map<String, Pair<String, String>> getSubrepositories(@NotNull final File workingDir, @NotNull final String revision) throws VcsException, IOException {
+    CatCommand cc = new CatCommand(mySettings, workingDir);
+    cc.setRevId(revision);
+    File catDir = null;
+    try {
+      catDir = cc.execute(Arrays.asList(".hgsub", ".hgsubstate"), false);
+      File hgsub = new File(catDir, ".hgsub");
+      File hgsubstate = new File(catDir, ".hgsubstate");
+      return readSubrepositories(hgsub, hgsubstate);
+    } catch (VcsException e) {
+      return Collections.emptyMap();
+    } finally {
+      if (catDir != null)
+        delete(catDir);
+    }
+  }
+
+
+  private Map<String, Pair<String, String>> readSubrepositories(@NotNull final File hgsub, @NotNull final File hgsubstate) throws IOException {
+    if (hgsub.exists() && hgsubstate.exists()) {
+      Map<String, String> path2repo = readHgsub(hgsub);
+      Map<String, String> path2revision = readHgsubstate(hgsubstate);
+      Map<String, Pair<String, String>> result = new HashMap<String, Pair<String, String>>();
+      for (Map.Entry<String, String> entry : path2repo.entrySet()) {
+        String path = entry.getKey();
+        String repo = entry.getValue();
+        String revision = path2revision.get(path);
+        if (revision != null) {
+          result.put(path, Pair.create(repo, revision));
+        } else {
+          myLogger.warning("Cannot find revision for subrepository at path " + path + " skip it");
+        }
+      }
+      return result;
+    } else {
+      return Collections.emptyMap();
+    }
+  }
+
+
+  /*returns map: relative path -> repository url */
+  private Map<String, String> readHgsub(@NotNull final File hgsub) throws IOException {
+    Map<String, String> result = new HashMap<String, String>();
+    for (String line : FileUtil.readFile(hgsub)) {
+      String[] parts = line.split(" = ");
+      if (parts.length == 2) {
+        result.put(parts[0], parts[1]);
+      } else {
+        myLogger.warning("Cannot parse the line '" + line + "' from .hgsub, skip it");
+      }
+    }
+    return result;
+  }
+
+
+  /*returns map: relative path -> revision */
+  private Map<String, String> readHgsubstate(@NotNull final File hgsubstate) throws IOException {
+    Map<String, String> result = new HashMap<String, String>();
+    for (String line : FileUtil.readFile(hgsubstate)) {
+      String[] parts = line.split(" ");
+      if (parts.length == 2) {
+        result.put(parts[1], parts[0]);
+      } else {
+        myLogger.warning("Cannot parse the line '" + line + "' from .hgsubstate, skip it");
+      }
+    }
+    return result;
+  }
+
+
+  /*returns map repository path -> (old url, new url)*/
+  private Map<String, Pair<String, String>> getSubrepositoriesWithChangedUrls(@NotNull final Map<String, Pair<String, String>> subrepos1, @NotNull final Map<String, Pair<String, String>> subrepos2) {
+    Map<String, Pair<String, String>> result = new HashMap<String, Pair<String, String>>();
+    for (Map.Entry<String, Pair<String, String>> entry : subrepos1.entrySet()) {
+      String path = entry.getKey();
+      String url1 = entry.getValue().first;
+      Pair<String, String> urlRevision = subrepos2.get(path);
+      if (urlRevision != null && !url1.equals(urlRevision.first))
+        result.put(path, Pair.create(url1, urlRevision.first));
+    }
+    return result;
+  }
+
+
+  private boolean isInitialClone(@NotNull final String workingDirRevision) {
+    return "000000000000".equals(workingDirRevision);
+  }
+
+
+  private String getWorkingDirRevision(@NotNull final Settings settings, @NotNull final File workingDir) throws VcsException {
+    IdentifyCommand id = new IdentifyCommand(settings, workingDir);
+    id.setInLocalRepository(true);
+    return id.execute();
+  }
+
+
+  private void doUpdateWorkingDir(@NotNull final File workingDir) throws VcsException {
+    myLogger.message("Updating folder " + workingDir.getAbsolutePath() + " to revision " + myToVersion);
+    UpdateCommand update = new UpdateCommand(mySettings, workingDir);
+    addUpdateAuthConfigParams(update);
+    update.setToId(new ChangeSet(myToVersion).getId());
+    update.execute();
+    myLogger.message("Folder successfully updated");
+  }
+
+
+  private void addUpdateAuthConfigParams(@NotNull UpdateCommand update) {
+    String username = mySettings.getUsername();
+    String password = mySettings.getPassword();
+    if (username == null || password == null)
+      return;
+    update.withConfig("auth.tc.prefix", "*")
+          .withConfig("auth.tc.username", username)
+          .withConfig("auth.tc.password", password)
+          .withConfig("auth.tc.schemes", "http https");
+  }
+
+
+  private String getDefaultPullUrl(Settings settings, boolean useLocalMirror) throws IOException {
+    if (useLocalMirror) {
+      File mirrorDir = myMirrorManager.getMirrorDir(settings.getRepository());
+      return mirrorDir.getCanonicalPath();
+    } else {
+      return settings.getRepositoryUrlWithCredentials();
+    }
+  }
+
+
+  private void checkRuleIsValid(IncludeRule includeRule) throws VcsException {
+    if (includeRule.getTo() != null && includeRule.getTo().length() > 0) {
+      if (!".".equals(includeRule.getFrom()) && includeRule.getFrom().length() != 0) {
+        throw new VcsException("Invalid include rule: " + includeRule.toString() + ", Mercurial plugin supports mapping of the form: +:.=>dir only.");
+      }
+    }
+  }
+
+
+  public boolean isClonedFromLocalMirror(@NotNull final File workingDir) {
+    try {
+      File mirrorDir = myMirrorManager.getMirrorDir(mySettings.getRepository());
+      File hgrc = new File(workingDir, ".hg" + File.separator + "hgrc");
+      String config = FileUtil.readText(hgrc);
+      return config.contains("default = " + mirrorDir.getCanonicalPath());
+    } catch (Exception e) {
+      return false;
+    }
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Constants.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Constants.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,30 +1,31 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial;
-
-import jetbrains.buildServer.vcs.VcsRoot;
-
-public interface Constants {
-  String VCS_NAME = "mercurial";
-  String REPOSITORY_PROP = "repositoryPath";
-  String BRANCH_NAME_PROP = "branchName";
-  String HG_COMMAND_PATH_PROP = "hgCommandPath";
-  String HG_PATH_ENV = "TEAMCITY_HG_PATH";
-  String SERVER_CLONE_PATH_PROP = "serverClonePath";
-  String USERNAME = "username";
-  String PASSWORD = VcsRoot.SECURE_PROPERTY_PREFIX + "password";
-  String UNCOMPRESSED_TRANSFER = "uncompressedTransfer";
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import jetbrains.buildServer.vcs.VcsRoot;
+
+public interface Constants {
+  String VCS_NAME = "mercurial";
+  String REPOSITORY_PROP = "repositoryPath";
+  String BRANCH_NAME_PROP = "branchName";
+  String HG_COMMAND_PATH_PROP = "hgCommandPath";
+  String HG_PATH_ENV = "TEAMCITY_HG_PATH";
+  String SERVER_CLONE_PATH_PROP = "serverClonePath";
+  String USERNAME = "username";
+  String PASSWORD = VcsRoot.SECURE_PROPERTY_PREFIX + "password";
+  String UNCOMPRESSED_TRANSFER = "uncompressedTransfer";
+  String USER_FOR_TAG = "tagUsername";
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgPathProvider.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,13 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.Settings;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author dmitry.neverov
+ */
+public interface HgPathProvider {
+
+  String getHgPath(@NotNull Settings settings);
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/HgVersion.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,104 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author dmitry.neverov
+ */
+public class HgVersion implements Comparable<HgVersion> {
+
+  private static final String PREFIX = "Mercurial Distributed SCM (version ";
+
+  private final int myMajor;
+  private final int myMinor;
+  private final int myThird;
+
+
+  public HgVersion(int major, int minor, int third) {
+    myMajor = major;
+    myMinor = minor;
+    myThird = third;
+  }
+
+
+  public static HgVersion parse(@NotNull final String version) {
+    Parser p = new Parser(version);
+    if (!p.skipString(PREFIX))
+      throw new IllegalArgumentException("Incorrect version format: " + version);
+    int major = p.readInt();
+    p.skipString(".");
+    int minor = p.readInt();
+    int third = p.skipString(".") ? p.readInt() : 0;
+    return new HgVersion(major, minor, third);
+  }
+
+
+  public boolean isEqualsOrGreaterThan(HgVersion other) {
+    return compareTo(other) >= 0;
+  }
+
+
+  @Override
+  public String toString() {
+    return myMajor + "." + myMinor + "." + myThird;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return (o instanceof HgVersion) && this.compareTo((HgVersion) o) == 0;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = myMajor;
+    result = 31 * result + myMinor;
+    result = 31 * result + myThird;
+    return result;
+  }
+
+  public int compareTo(HgVersion other) {
+    int d = myMajor - other.myMajor;
+    if (d != 0)
+      return d;
+
+    d = myMinor - other.myMinor;
+    if (d != 0)
+      return d;
+
+    return myThird - other.myThird;
+  }
+
+
+  private static final class Parser {
+
+    private final String myString;
+    private int myIndex = 0;
+
+    Parser(@NotNull String string) {
+      myString = string;
+    }
+
+
+    boolean skipString(String str) {
+      if (myIndex == myString.length() || myIndex + str.length() > myString.length())
+        return false;
+      String substr = myString.substring(myIndex, myIndex + str.length());
+      if (substr.equals(str)) {
+        myIndex = myIndex + str.length();
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+
+    int readInt() {
+      int result = 0;
+      while (myIndex < myString.length() && Character.isDigit(myString.codePointAt(myIndex))) {
+        result = result * 10 + Character.digit(myString.codePointAt(myIndex), 10);
+        myIndex++;
+      }
+      return result;
+    }
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MirrorManager.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MirrorManager.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,47 +1,15 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
-import com.intellij.openapi.diagnostic.Logger;
-import jetbrains.buildServer.util.FileUtil;
-import jetbrains.buildServer.util.Hash;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- * Manages local mirrors of remote repositories.
- * Each unique url get unique local mirror. Each mirror is used for one url only.
  * @author dmitry.neverov
  */
-public final class MirrorManager {
-
-  private static Logger LOG = Logger.getInstance(MirrorManager.class.getName());
-  private static final String MIRROR_DIR_PREFIX = "hg_";
-  private static final String MAPPING_FILE_NAME = "map";
-
-  private final ReadWriteLock myLock = new ReentrantReadWriteLock();
-  private final File myRootDir;
-  /*Only one thread read or write to this file, it is protected by myLock.writeLock()*/
-  private final File myMappingFile;
-  /*Protected by myLock*/
-  private final Map<String, File> myMirrors = new HashMap<String, File>();
-  private HashCalculator myHash = new StandartHash();
-
-  /**
-   * @param rootDir root directory where all mirrors are stored
-   */
-  public MirrorManager(File rootDir) {
-    myRootDir = rootDir;
-    myMappingFile = new File(myRootDir, MAPPING_FILE_NAME);
-    readMappingFromFile();
-  }
-
+public interface MirrorManager {
 
   /**
    * Get directory of local mirror repository for specified url, if directory is not exists it is created
@@ -49,197 +17,29 @@
    * @return see above
    */
   @NotNull
-  public File getMirrorDir(@NotNull final String url) {
-    File result = getMirrorDirWithLock(url);
-    if (result == null) {
-      result = createDirFor(url);
-    }
-    return result;
-  }
-
+  public File getMirrorDir(@NotNull final String url);
 
   /**
    * Get all local mirror repository dirs
    * @return see above
    */
   @NotNull
-  public List<File> getMirrors() {
-    myLock.readLock().lock();
-    try {
-      return new ArrayList<File>(myMirrors.values());
-    } finally {
-      myLock.readLock().unlock();
-    }
-  }
-
-
-  //for tests only
-  void setHashCalculator(HashCalculator hash) {
-    myHash = hash;
-  }
-
-
-  private File createDirFor(String url) {
-    File result;
-    myLock.writeLock().lock();
-    try {
-      File mirrorDir = getUniqueDir(url);
-      result = saveMappingIfAbsent(url, mirrorDir);
-    } finally {
-      myLock.writeLock().unlock();
-    }
-    if (!result.exists()) {
-      result.mkdirs();
-    }
-    return result;
-  }
-
-
-  private File getMirrorDirWithLock(String url) {
-    myLock.readLock().lock();
-    try {
-      return myMirrors.get(url);
-    } finally {
-      myLock.readLock().unlock();
-    }
-  }
-
-
-  //should be called with myLock.writeLock() held
-  private File saveMappingIfAbsent(String url, File mirrorDir) {
-    File existing = myMirrors.get(url);
-    if (existing != null) {
-      return existing;
-    } else {
-      myMirrors.put(url, mirrorDir);
-      saveMappingToFile();
-      return mirrorDir;
-    }
-  }
-
-
-  private File getUniqueDir(String url) {
-    myLock.readLock().lock();
-    try {
-      String dirName = MIRROR_DIR_PREFIX + hash(normalize(url));
-      File result = PathUtil.getCanonicalFile(new File(myRootDir, dirName));
-      while (isUsedForOtherUrl(result, url)) {
-        dirName = MIRROR_DIR_PREFIX + hash(result.getName());
-        result = PathUtil.getCanonicalFile(new File(myRootDir, dirName));
-      }
-      return result;
-    } finally {
-      myLock.readLock().unlock();
-    }
-  }
-
-
-  private boolean isUsedForOtherUrl(File repositoryDir, String url) {
-    myLock.readLock().lock();
-    try {
-      for (Map.Entry<String, File> mirror : myMirrors.entrySet()) {
-        String mirrorUrl = mirror.getKey();
-        File mirrorDir = mirror.getValue();
-        if (mirrorDir.equals(repositoryDir) && !mirrorUrl.equals(url)) {
-          return true;
-        }
-      }
-      return false;
-    } finally {
-      myLock.readLock().unlock();
-    }
-  }
-
+  public List<File> getMirrors();
 
-  private String hash(String value) {
-    return String.valueOf(myHash.calc(value));
-  }
-
-
-  private static String normalize(final String path) {
-    String normalized = PathUtil.normalizeSeparator(path);
-    if (path.endsWith("/")) {
-      return normalized.substring(0, normalized.length()-1);
-    }
-    return normalized;
-  }
-
-
-  private void readMappingFromFile() {
-    myLock.writeLock().lock();
-    try {
-      LOG.debug("Parse mapping file " + myMappingFile.getAbsolutePath());
-      for (String line : readLines()) {
-        int separatorIndex = line.lastIndexOf(" = ");
-        if (separatorIndex == -1) {
-          if (!line.equals(""))
-            LOG.warn("Cannot parse mapping '" + line + "', skip it.");
-        } else {
-          String url = line.substring(0, separatorIndex);
-          String dirName = line.substring(separatorIndex + 3);
-          File repositoryDir = PathUtil.getCanonicalFile(new File(myRootDir, dirName));
-          if (isUsedForOtherUrl(repositoryDir, url)) {
-            LOG.error("Skip mapping " + line + ": " + dirName + " is used for url other than " + url);
-          } else {
-            myMirrors.put(url, PathUtil.getCanonicalFile(new File(myRootDir, dirName)));
-          }
-        }
-      }
-    } finally {
-      myLock.writeLock().unlock();
-    }
-  }
+  /**
+   * Forget specified dir. After call to this method with non-empty dir,
+   * all urls which were mapped to this dir will be mapped to another.
+   * If dir is empty, subsequent call getMirrorDir(dir) will return the
+   * same dir.
+   *
+   * @param dir dir of interest
+   */
+  public void forgetDir(@NotNull final File dir);
 
-  /*Should be called with myLock.writeLock() held*/
-  private List<String> readLines() {
-    if (myMappingFile.exists()) {
-      try {
-        return FileUtil.readFile(myMappingFile);
-      } catch (IOException e) {
-        LOG.error("Error while reading a mapping file at " + myMappingFile.getAbsolutePath() + " starting with empty mapping", e);
-        return new ArrayList<String>();
-      }
-    } else {
-      LOG.debug("No mapping file found at " + myMappingFile.getAbsolutePath() + " starting with empty mapping");
-      File parentDir = myMappingFile.getParentFile();
-      if (!parentDir.exists() && !parentDir.mkdirs()) {
-        LOG.error("Cannot create local mirrors dir at " + parentDir.getAbsolutePath());
-      } else {
-        try {
-          if (!myMappingFile.createNewFile())
-            LOG.warn("Someone else creates a mapping file " + myMappingFile.getAbsolutePath() + ", will use it");
-        } catch (IOException e) {
-          LOG.error("Cannot create a mapping file at " + myMappingFile.getAbsolutePath(), e);
-        }
-      }
-      return new ArrayList<String>();
-    }
-  }
+  @NotNull
+  public Map<String, File> getMappings();
 
+  public void lockDir(@NotNull File dir);
 
-  private void saveMappingToFile() {
-    myLock.writeLock().lock();
-    try {
-      StringBuilder sb = new StringBuilder();
-      for (Map.Entry<String, File> mirror : myMirrors.entrySet()) {
-        String url = mirror.getKey();
-        String dir = mirror.getValue().getName();
-        sb.append(url).append(" = ").append(dir).append("\n");
-      }
-      FileUtil.writeFile(myMappingFile, sb.toString());
-    } finally {
-      myLock.writeLock().unlock();
-    }
-  }
-
-
-  final static class StandartHash implements HashCalculator {
-    public long calc(String value) {
-      return Hash.calc(value);
-    }
-  }
-
-  public static interface HashCalculator {
-    long calc(String value);
-  }
+  public void unlockDir(@NotNull File dir);
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MirrorManagerImpl.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,331 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import com.intellij.openapi.diagnostic.Logger;
+import jetbrains.buildServer.util.FileUtil;
+import jetbrains.buildServer.util.Hash;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import static jetbrains.buildServer.util.FileUtil.isEmptyDir;
+
+/**
+ * Manages local mirrors of remote repositories.
+ * Each unique url get unique local mirror. Each mirror is used for one url only.
+ * @author dmitry.neverov
+ */
+public final class MirrorManagerImpl implements MirrorManager {
+
+  private static Logger LOG = Logger.getInstance(MirrorManagerImpl.class.getName());
+  private static final String MIRROR_DIR_PREFIX = "hg_";
+  private static final String MAPPING_FILE_NAME = "map";
+
+  private final ReadWriteLock myLock = new ReentrantReadWriteLock();
+  private final File myRootDir;
+  /*Only one thread read or write to this file, it is protected by myLock.writeLock()*/
+  private final File myMappingFile;
+  /*Protected by myLock*/
+  private final Map<String, File> myMirrors = new HashMap<String, File>();
+  private HashCalculator myHash = new StandartHash();
+
+  private final ConcurrentMap<String, Lock> myDirLocks = new ConcurrentHashMap<String, Lock>();
+
+  public MirrorManagerImpl(@NotNull PluginConfig config) {
+    myRootDir = config.getCachesDir();
+    myMappingFile = new File(myRootDir, MAPPING_FILE_NAME);
+    readMappingFromFile();
+  }
+
+
+  /**
+   * Get directory of local mirror repository for specified url, if directory is not exists it is created
+   * @param url url of interest
+   * @return see above
+   */
+  @NotNull
+  public File getMirrorDir(@NotNull final String url) {
+    File result = getMirrorDirWithLock(url);
+    if (result == null) {
+      result = createDirFor(url);
+    }
+    return result;
+  }
+
+
+  /**
+   * Get all local mirror repository dirs
+   * @return see above
+   */
+  @NotNull
+  public List<File> getMirrors() {
+    myLock.readLock().lock();
+    try {
+      return new ArrayList<File>(myMirrors.values());
+    } finally {
+      myLock.readLock().unlock();
+    }
+  }
+
+
+  @NotNull
+  public Map<String, File> getMappings() {
+    myLock.readLock().lock();
+    try {
+      return new HashMap<String, File>(myMirrors);
+    } finally {
+      myLock.readLock().unlock();
+    }
+  }
+
+  public void lockDir(@NotNull final File dir) {
+    lockFor(dir).lock();
+  }
+
+  public void unlockDir(@NotNull final File dir) {
+    lockFor(dir).unlock();
+  }
+
+  private Lock lockFor(final File dir) {
+    String path = dir.getAbsolutePath();
+    Lock lock = myDirLocks.get(path);
+    if (lock == null) {
+      lock = new ReentrantLock();
+      Lock curLock = myDirLocks.putIfAbsent(path, lock);
+      if (curLock != null)
+        lock = curLock;
+    }
+    return lock;
+  }
+
+  /**
+   * Forget specified dir. After call to this method with non-empty dir,
+   * all urls which were mapped to this dir will be mapped to another.
+   * If dir is empty, subsequent call getMirrorDir(dir) will return the
+   * same dir.
+   *
+   * @param dir dir of interest
+   */
+  public void forgetDir(@NotNull final File dir) {
+    myLock.writeLock().lock();
+    try {
+      removeMappingsToDir(dir);
+      saveMappingToFile();
+    } finally {
+      myLock.writeLock().unlock();
+    }
+  }
+
+  private void removeMappingsToDir(@NotNull final File dir) {
+    Set<String> keysToRemove = getUrlsMappedToDir(dir);
+    for (String key : keysToRemove) {
+      myMirrors.remove(key);
+    }
+  }
+
+  private Set<String> getUrlsMappedToDir(@NotNull final File dir) {
+    Set<String> urlsMappedToDir = new HashSet<String>();
+    for (Map.Entry<String, File> entry : myMirrors.entrySet()) {
+      File f = entry.getValue();
+      if (f.equals(dir))
+        urlsMappedToDir.add(entry.getKey());
+    }
+    return urlsMappedToDir;
+  }
+
+
+  //for tests only
+  void setHashCalculator(HashCalculator hash) {
+    myHash = hash;
+  }
+
+
+  private File createDirFor(String url) {
+    File result;
+    myLock.writeLock().lock();
+    try {
+      File mirrorDir = getUniqueDir(url);
+      result = saveMappingIfAbsent(url, mirrorDir);
+    } finally {
+      myLock.writeLock().unlock();
+    }
+    if (!result.exists()) {
+      result.mkdirs();
+    }
+    return result;
+  }
+
+
+  private File getMirrorDirWithLock(String url) {
+    myLock.readLock().lock();
+    try {
+      return myMirrors.get(url);
+    } finally {
+      myLock.readLock().unlock();
+    }
+  }
+
+
+  //should be called with myLock.writeLock() held
+  private File saveMappingIfAbsent(String url, File mirrorDir) {
+    File existing = myMirrors.get(url);
+    if (existing != null) {
+      return existing;
+    } else {
+      myMirrors.put(url, mirrorDir);
+      saveMappingToFile();
+      return mirrorDir;
+    }
+  }
+
+
+  private File getUniqueDir(String url) {
+    myLock.readLock().lock();
+    try {
+      String dirName = MIRROR_DIR_PREFIX + hash(normalize(url));
+      File result = PathUtil.getCanonicalFile(new File(myRootDir, dirName));
+      while (isUsedForOtherUrl(result, url) || !isEmptyDir(result)) {
+        dirName = MIRROR_DIR_PREFIX + hash(result.getName());
+        result = PathUtil.getCanonicalFile(new File(myRootDir, dirName));
+      }
+      return result;
+    } finally {
+      myLock.readLock().unlock();
+    }
+  }
+
+
+  private boolean isUsedForOtherUrl(File repositoryDir, String url) {
+    myLock.readLock().lock();
+    try {
+      for (Map.Entry<String, File> mirror : myMirrors.entrySet()) {
+        String mirrorUrl = mirror.getKey();
+        File mirrorDir = mirror.getValue();
+        if (mirrorDir.equals(repositoryDir) && !mirrorUrl.equals(url)) {
+          return true;
+        }
+      }
+      return false;
+    } finally {
+      myLock.readLock().unlock();
+    }
+  }
+
+
+  private String hash(String value) {
+    return String.valueOf(myHash.calc(value));
+  }
+
+
+  private static String normalize(final String path) {
+    String normalized = PathUtil.normalizeSeparator(path);
+    if (path.endsWith("/")) {
+      return normalized.substring(0, normalized.length()-1);
+    }
+    return normalized;
+  }
+
+
+  private void readMappingFromFile() {
+    myLock.writeLock().lock();
+    try {
+      LOG.debug("Parse mapping file " + myMappingFile.getAbsolutePath());
+      for (String line : readLines()) {
+        int separatorIndex = line.lastIndexOf(" = ");
+        if (separatorIndex == -1) {
+          if (!line.equals(""))
+            LOG.warn("Cannot parse mapping '" + line + "', skip it.");
+        } else {
+          String url = line.substring(0, separatorIndex);
+          String dirName = line.substring(separatorIndex + 3);
+          File repositoryDir = PathUtil.getCanonicalFile(new File(myRootDir, dirName));
+          if (isUsedForOtherUrl(repositoryDir, url)) {
+            LOG.error("Skip mapping " + line + ": " + dirName + " is used for url other than " + url);
+          } else {
+            myMirrors.put(url, PathUtil.getCanonicalFile(new File(myRootDir, dirName)));
+          }
+        }
+      }
+    } finally {
+      myLock.writeLock().unlock();
+    }
+  }
+
+  /*Should be called with myLock.writeLock() held*/
+  private List<String> readLines() {
+    if (myMappingFile.exists()) {
+      try {
+        return FileUtil.readFile(myMappingFile);
+      } catch (IOException e) {
+        LOG.error("Error while reading a mapping file at " + myMappingFile.getAbsolutePath() + " starting with empty mapping", e);
+        return new ArrayList<String>();
+      }
+    } else {
+      LOG.debug("No mapping file found at " + myMappingFile.getAbsolutePath() + " starting with empty mapping");
+      File parentDir = myMappingFile.getParentFile();
+      if (!parentDir.exists() && !parentDir.mkdirs()) {
+        LOG.error("Cannot create local mirrors dir at " + parentDir.getAbsolutePath());
+      } else {
+        try {
+          if (!myMappingFile.createNewFile())
+            LOG.warn("Someone else creates a mapping file " + myMappingFile.getAbsolutePath() + ", will use it");
+        } catch (IOException e) {
+          LOG.error("Cannot create a mapping file at " + myMappingFile.getAbsolutePath(), e);
+        }
+      }
+      return new ArrayList<String>();
+    }
+  }
+
+
+  private void saveMappingToFile() {
+    myLock.writeLock().lock();
+    try {
+      StringBuilder sb = new StringBuilder();
+      for (Map.Entry<String, File> mirror : myMirrors.entrySet()) {
+        String url = mirror.getKey();
+        String dir = mirror.getValue().getName();
+        sb.append(url).append(" = ").append(dir).append("\n");
+      }
+      FileUtil.writeFile(myMappingFile, sb.toString());
+    } finally {
+      myLock.writeLock().unlock();
+    }
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    myLock.readLock().lock();
+    try {
+      Iterator<Map.Entry<String, File>> iter = myMirrors.entrySet().iterator();
+      while (iter.hasNext()) {
+        Map.Entry<String, File> entry = iter.next();
+        sb.append("[").append(entry.getKey()).append("]").append("->").append(entry.getValue().getAbsolutePath());
+        if (iter.hasNext())
+          sb.append("\n");
+      }
+    } finally {
+      myLock.readLock().unlock();
+    }
+    return sb.toString();
+  }
+
+  final static class StandartHash implements HashCalculator {
+    public long calc(String value) {
+      return Hash.calc(value);
+    }
+  }
+
+  public static interface HashCalculator {
+    long calc(String value);
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/PathUtil.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/PathUtil.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,37 +1,37 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.IOException;
-
-public class PathUtil {
-  @NotNull
-  public static String normalizeSeparator(@NotNull String repPath) {
-    return repPath.replace('\\', '/');
-  }
-
-  @NotNull
-  public static File getCanonicalFile(@NotNull File file) {
-    try {
-      return file.getCanonicalFile();
-    } catch (IOException e) {
-      return file.getAbsoluteFile();
-    }
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+
+public class PathUtil {
+  @NotNull
+  public static String normalizeSeparator(@NotNull String repPath) {
+    return repPath.replace('\\', '/');
+  }
+
+  @NotNull
+  public static File getCanonicalFile(@NotNull File file) {
+    try {
+      return file.getCanonicalFile();
+    } catch (IOException e) {
+      return file.getAbsoluteFile();
+    }
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/PluginConfig.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/PluginConfig.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,10 +1,15 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
 /**
  * @author dmitry.neverov
  */
 public interface PluginConfig {
 
-  int getPullTimeout();
+  @NotNull
+  File getCachesDir();
 
 }

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -20,7 +20,9 @@
 
 import java.io.File;
 
-public class ArchiveCommand extends BaseCommand {
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandExecutionSettingsBuilder.with;
+
+public class ArchiveCommand extends VcsRootCommand {
   private File myDestDir;
   private String myToId;
 
@@ -45,8 +47,7 @@
     setRevision(cli);
     setDestination(cli);
 
-    CommandResult res = runCommand(cli);
-    failIfNotEmptyStdErr(cli, res);
+    runCommand(cli, with().failureWhenStderrNotEmpty());
     deleteHgArchival();
   }
 

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,91 +1,60 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.util.StringUtil;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author pavel
- */
-public class BaseCommand {
-  private Settings mySettings;
-  private String myWorkDirectory;
-
-  public BaseCommand(@NotNull final Settings settings, @NotNull File workingDir) {
-    mySettings = settings;
-    myWorkDirectory = workingDir.getAbsolutePath();
-  }
-
-
-  public Settings getSettings() {
-    return mySettings;
-  }
-
-  /**
-   * Sets new working directory, by default working directory is taken from the Settings#getLocalRepositoryDir
-   * @param workDirectory work dir
-   */
-  public void setWorkDirectory(final String workDirectory) {
-    myWorkDirectory = workDirectory;
-  }
-
-  public String getWorkDirectory() {
-    return myWorkDirectory;
-  }
-
-  protected GeneralCommandLine createCommandLine() {
-    GeneralCommandLine cli = createCL();
-    cli.setWorkDirectory(myWorkDirectory);
-    cli.setPassParentEnvs(true);
-    return cli;
-  }
-
-  protected GeneralCommandLine createCL() {
-    GeneralCommandLine cl = new MercurialCommandLine(getPrivateData());
-    cl.setExePath(getSettings().getHgCommandPath());
-    return cl;
-  }
-
-  protected CommandResult runCommand(@NotNull GeneralCommandLine cli) throws VcsException {
-    return CommandUtil.runCommand(cli, getPrivateData());
-  }
-
-  protected CommandResult runCommand(@NotNull GeneralCommandLine cli, boolean logErrorsInDebug) throws VcsException {
-    return CommandUtil.runCommand(cli, CommandUtil.DEFAULT_COMMAND_TIMEOUT_SEC, getPrivateData(), logErrorsInDebug);
-  }
-
-  protected CommandResult runCommand(@NotNull GeneralCommandLine cli, int executionTimeout) throws VcsException {
-    return CommandUtil.runCommand(cli, executionTimeout, getPrivateData());
-  }
-
-  protected void failIfNotEmptyStdErr(@NotNull GeneralCommandLine cli, @NotNull CommandResult res) throws VcsException {
-    if (!StringUtil.isEmpty(res.getStderr())) {
-      CommandUtil.commandFailed(cli.getCommandLineString(), res);
-    }
-  }
-
-  public Set<String> getPrivateData() {
-    String password = mySettings.getPassword();
-    return password != null ? Collections.singleton(password) : Collections.<String>emptySet();
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.Set;
+
+import static java.util.Collections.emptySet;
+
+/**
+ * @author pavel
+ */
+public class BaseCommand {
+
+  private final String myHgPath;
+  private final File myWorkDirectory;
+
+  public BaseCommand(@NotNull final String hgPath, @NotNull File workingDir) {
+    myHgPath = hgPath;
+    myWorkDirectory = workingDir;
+  }
+
+
+  public File getWorkDirectory() {
+    return myWorkDirectory;
+  }
+
+  protected GeneralCommandLine createCommandLine() {
+    GeneralCommandLine cli = createCL();
+    cli.setWorkDirectory(myWorkDirectory.getAbsolutePath());
+    cli.setPassParentEnvs(true);
+    return cli;
+  }
+
+  protected GeneralCommandLine createCL() {
+    GeneralCommandLine cl = new MercurialCommandLine(getPrivateData());
+    cl.setExePath(myHgPath);
+    return cl;
+  }
+
+  protected Set<String> getPrivateData() {
+    return emptySet();
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BranchesCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BranchesCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,60 +1,60 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Pavel.Sher
- *         Date: 26.10.2008
- */
-public class BranchesCommand extends BaseCommand {
-
-  public BranchesCommand(@NotNull Settings settings, @NotNull File workingDir) {
-    super(settings, workingDir);
-  }
-
-  /**
-   * Returns map of branch name to latest changeset in that branch
-   * @return see above
-   * @throws jetbrains.buildServer.vcs.VcsException if error occurs
-   */
-  public Map<String, ChangeSet> execute() throws VcsException {
-    GeneralCommandLine cli = createCommandLine();
-    cli.addParameter("branches");
-    CommandResult res = runCommand(cli);
-    String stdout = res.getStdout();
-    Map<String, ChangeSet> result = new HashMap<String, ChangeSet>();
-    Pattern branchPattern = Pattern.compile("(.*)[\\s]+([0-9]+:[A-Za-z0-9]+).*");
-    for (String line: stdout.split("[\r\n]+")) {
-      Matcher matcher = branchPattern.matcher(line);
-      if (matcher.matches()) {
-        String branchName = matcher.group(1).trim();
-        String changeId = matcher.group(2).trim();
-        result.put(branchName, new ChangeSet(changeId));
-      }
-    }
-    return result;
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Pavel.Sher
+ *         Date: 26.10.2008
+ */
+public class BranchesCommand extends VcsRootCommand {
+
+  public BranchesCommand(@NotNull Settings settings, @NotNull File workingDir) {
+    super(settings, workingDir);
+  }
+
+  /**
+   * Returns map of branch name to latest changeset in that branch
+   * @return see above
+   * @throws jetbrains.buildServer.vcs.VcsException if error occurs
+   */
+  public Map<String, ChangeSet> execute() throws VcsException {
+    GeneralCommandLine cli = createCommandLine();
+    cli.addParameter("branches");
+    CommandResult res = runCommand(cli);
+    String stdout = res.getStdout();
+    Map<String, ChangeSet> result = new HashMap<String, ChangeSet>();
+    Pattern branchPattern = Pattern.compile("(.*)[\\s]+([0-9]+:[A-Za-z0-9]+).*");
+    for (String line: stdout.split("[\r\n]+")) {
+      Matcher matcher = branchPattern.matcher(line);
+      if (matcher.matches()) {
+        String branchName = matcher.group(1).trim();
+        String changeId = matcher.group(2).trim();
+        result.put(branchName, new ChangeSet(changeId));
+      }
+    }
+    return result;
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,88 +1,105 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.util.FileUtil;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-
-public class CatCommand extends BaseCommand {
-  private String myRevId;
-  private final static int MAX_CMD_LEN = 900;
-  private boolean myLogErrorsInDebug = false;
-
-  public CatCommand(@NotNull Settings settings, @NotNull File workingDir) {
-    super(settings, workingDir);
-  }
-
-  public void setRevId(final String revId) {
-    myRevId = revId;
-  }
-
-  public void setLogErrorsInDebug(boolean doLogErrorsInDebug) {
-    myLogErrorsInDebug = doLogErrorsInDebug;
-  }
-
-  public File execute(List<String> relPaths) throws VcsException {
-    File tempDir;
-    try {
-      tempDir = FileUtil.createTempDirectory("mercurial", "catresult");
-    } catch (IOException e) {
-      throw new VcsException("Unable to create temporary directory");
-    }
-    for (String path: relPaths) {
-      final File parentFile = new File(tempDir, path).getParentFile();
-      if (!parentFile.isDirectory() && !parentFile.mkdirs()) {
-        throw new VcsException("Failed to create directory: " + parentFile.getAbsolutePath());
-      }
-    }
-
-    Queue<String> paths = new LinkedList<String>(relPaths);
-    while (!paths.isEmpty()) {
-      GeneralCommandLine cli = createCommandLine(tempDir);
-      int cmdSize = cli.getCommandLineString().length();
-
-      do {
-        String path = paths.poll();
-        cli.addParameter(path);
-        cmdSize += path.length();
-      } while (cmdSize < MAX_CMD_LEN && !paths.isEmpty());
-
-      runCommand(cli, myLogErrorsInDebug);
-    }
-
-    return tempDir;
-  }
-
-  private GeneralCommandLine createCommandLine(final File tempDir) {
-    GeneralCommandLine cli = createCommandLine();
-    cli.addParameter("cat");
-    cli.addParameter("-o");
-    cli.addParameter(tempDir.getAbsolutePath() + File.separator + "%p");
-    if (myRevId != null) {
-      cli.addParameter("-r");
-      cli.addParameter(myRevId);
-    }
-    return cli;
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import jetbrains.buildServer.util.FileUtil;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+import static com.intellij.openapi.util.io.FileUtil.delete;
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandExecutionSettingsBuilder.with;
+
+public class CatCommand extends VcsRootCommand {
+  private String myRevId;
+  private final static int MAX_CMD_LEN = 900;
+
+  public CatCommand(@NotNull Settings settings, @NotNull File workingDir) {
+    super(settings, workingDir);
+  }
+
+  public void setRevId(final String revId) {
+    myRevId = revId;
+  }
+
+  public File execute(List<String> relPaths) throws VcsException {
+    return execute(relPaths, true);
+  }
+
+  public File execute(List<String> relPaths, boolean checkFailure) throws VcsException {
+    File tempDir = null;
+    try {
+      tempDir = createTmpDir();
+      createDirectories(relPaths, tempDir);
+      catFiles(relPaths, checkFailure, tempDir);
+      return tempDir;
+    } catch (VcsException e) {
+      if (tempDir != null)
+        delete(tempDir);
+      throw e;
+    }
+  }
+
+  private File createTmpDir() throws VcsException {
+    try {
+      return FileUtil.createTempDirectory("mercurial", "catresult");
+    } catch (IOException e) {
+      throw new VcsException("Unable to create temporary directory");
+    }
+  }
+
+  private void createDirectories(List<String> relPaths, File tempDir) throws VcsException {
+    for (String path: relPaths) {
+      File parentFile = new File(tempDir, path).getParentFile();
+      if (!parentFile.isDirectory() && !parentFile.mkdirs())
+        throw new VcsException("Failed to create directory: " + parentFile.getAbsolutePath());
+    }
+  }
+
+  private void catFiles(List<String> relPaths, boolean checkFailure, File tempDir) throws VcsException {
+    Queue<String> paths = new LinkedList<String>(relPaths);
+    while (!paths.isEmpty()) {
+      GeneralCommandLine cli = createCommandLine(tempDir);
+      int cmdSize = cli.getCommandLineString().length();
+
+      do {
+        String path = paths.poll();
+        cli.addParameter(path);
+        cmdSize += path.length();
+      } while (cmdSize < MAX_CMD_LEN && !paths.isEmpty());
+
+      runCommand(cli, with().checkForFailure(checkFailure));
+    }
+  }
+
+  private GeneralCommandLine createCommandLine(final File tempDir) {
+    GeneralCommandLine cli = createCommandLine();
+    cli.addParameter("cat");
+    cli.addParameter("-o");
+    cli.addParameter(tempDir.getAbsolutePath() + File.separator + "%p");
+    if (myRevId != null) {
+      cli.addParameter("-r");
+      cli.addParameter(myRevId);
+    }
+    return cli;
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangeSet.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangeSet.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,115 +1,113 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Represents Mercurial change set
- */
-public class ChangeSet extends ChangeSetRevision {
-  @NotNull private String myUser;
-  @NotNull private Date myTimestamp;
-  private String myDescription;
-  private List<ChangeSetRevision> myParents = new ArrayList<ChangeSetRevision>();
-  private List<ModifiedFile> myModifiedFiles = new ArrayList<ModifiedFile>();
-
-
-  public ChangeSet(final int revNumber, @NotNull final String id) {
-    super(revNumber, id);
-  }
-
-  /**
-   * Constructor for version in the form revnum:changeset_id or just changeset_id (in this case rev number is set to -1)
-   * @param fullVersion full changeset version as reported by hg log command
-   */
-  public ChangeSet(@NotNull final String fullVersion) {
-    super(fullVersion);
-  }
-
-  public void setUser(@NotNull final String user) {
-    myUser = user;
-  }
-
-  public void setTimestamp(@NotNull final Date timestamp) {
-    myTimestamp = timestamp;
-  }
-
-  public void setDescription(final String description) {
-    myDescription = description;
-  }
-
-  public void addParent(@NotNull ChangeSetRevision rev) {
-    myParents.add(rev);
-  }
-
-  /**
-   * Returns user who made changeset
-   * @return user who made changeset
-   */
-  @NotNull
-  public String getUser() {
-    return myUser;
-  }
-
-  /**
-   * Returns changeset timestamp
-   * @return changeset timestamp
-   */
-  @NotNull
-  public Date getTimestamp() {
-    return myTimestamp;
-  }
-
-  /**
-   * Returns changeset summary specified by user
-   * @return changeset summary
-   */
-  public String getDescription() {
-    return myDescription;
-  }
-
-  /**
-   * Returns parrents of this change set
-   * @return see above
-   */
-  @NotNull
-  public List<ChangeSetRevision> getParents() {
-    return myParents;
-  }
-
-  /**
-   * Check if changeset is initial changeset (has no parents)
-   * @return true if changeset is initial changeset
-   */
-  public boolean isInitial() {
-    return getParents().isEmpty();
-  }
-
-  public void setModifiedFiles(@NotNull final List<ModifiedFile> files) {
-    myModifiedFiles = files;
-  }
-
-  @NotNull
-  public List<ModifiedFile> getModifiedFiles() {
-    return myModifiedFiles;
-  }
-
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Represents Mercurial change set
+ */
+public class ChangeSet extends ChangeSetRevision {
+  @NotNull private String myUser;
+  @NotNull private Date myTimestamp;
+  private String myDescription;
+  private List<ChangeSetRevision> myParents = new ArrayList<ChangeSetRevision>();
+  private List<ModifiedFile> myModifiedFiles = new ArrayList<ModifiedFile>();
+
+  public ChangeSet(final int revNumber, @NotNull final String id) {
+    super(revNumber, id);
+  }
+
+  /**
+   * Constructor for version in the form revnum:changeset_id or just changeset_id (in this case rev number is set to -1)
+   * @param fullVersion full changeset version as reported by hg log command
+   */
+  public ChangeSet(@NotNull final String fullVersion) {
+    super(fullVersion);
+  }
+
+  public void setUser(@NotNull final String user) {
+    myUser = user;
+  }
+
+  public void setTimestamp(@NotNull final Date timestamp) {
+    myTimestamp = timestamp;
+  }
+
+  public void setDescription(final String description) {
+    myDescription = description;
+  }
+
+  public void addParent(@NotNull ChangeSetRevision rev) {
+    myParents.add(rev);
+  }
+
+  /**
+   * Returns user who made changeset
+   * @return user who made changeset
+   */
+  @NotNull
+  public String getUser() {
+    return myUser;
+  }
+
+  /**
+   * Returns changeset timestamp
+   * @return changeset timestamp
+   */
+  @NotNull
+  public Date getTimestamp() {
+    return myTimestamp;
+  }
+
+  /**
+   * Returns changeset summary specified by user
+   * @return changeset summary
+   */
+  public String getDescription() {
+    return myDescription;
+  }
+
+  /**
+   * Returns parrents of this change set
+   * @return see above
+   */
+  @NotNull
+  public List<ChangeSetRevision> getParents() {
+    return myParents;
+  }
+
+  /**
+   * Check if changeset is initial changeset (has no parents)
+   * @return true if changeset is initial changeset
+   */
+  public boolean isInitial() {
+    return getParents().isEmpty();
+  }
+
+  public void setModifiedFiles(@NotNull final List<ModifiedFile> files) {
+    myModifiedFiles = files;
+  }
+
+  @NotNull
+  public List<ModifiedFile> getModifiedFiles() {
+    return myModifiedFiles;
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangeSetRevision.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangeSetRevision.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,99 +1,99 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Pavel.Sher
- */
-public class ChangeSetRevision {
-  private final int myRevNumber;
-  @NotNull
-  private final String myId;
-
-  public ChangeSetRevision(final int revNumber, @NotNull final String id) {
-    myRevNumber = revNumber;
-    myId = id;
-  }
-
-  /**
-   * Constructor for version in the form revnum:changeset_id or just changeset_id (in this case rev number is set to -1)
-   * @param fullVersion full changeset version as reported by hg log command
-   */
-  public ChangeSetRevision(@NotNull final String fullVersion) {
-    try {
-      int colon = fullVersion.indexOf(":");
-      if (colon != -1) {
-        myRevNumber = Integer.parseInt(fullVersion.substring(0, colon));
-        myId = fullVersion.substring(colon+1);
-      } else {
-        myRevNumber = -1;
-        myId = fullVersion;
-      }
-    } catch (Throwable e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
-
-  /**
-   * Returns changeset revision id
-   * @return changeset revision id
-   */
-  @NotNull
-  public String getId() {
-    return myId;
-  }
-
-  /**
-   * Returns changeset revision number
-   * @return changeset revision number
-   */
-  public int getRevNumber() {
-    return myRevNumber;
-  }
-
-  /**
-   * Returns full changeset version as reported by hg log command: revnum:revid
-   * @return full changeset version as reported by hg log
-   */
-  @NotNull
-  public String getFullVersion() {
-    return myRevNumber + ":" + myId;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final ChangeSetRevision that = (ChangeSetRevision) o;
-
-    return myRevNumber == that.myRevNumber && myId.equals(that.myId);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = myRevNumber;
-    result = 31 * result + myId.hashCode();
-    return result;
-  }
-
-  @Override
-  public String toString() {
-    return "change:" + myId;
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Pavel.Sher
+ */
+public class ChangeSetRevision {
+  private final int myRevNumber;
+  @NotNull
+  private final String myId;
+
+  public ChangeSetRevision(final int revNumber, @NotNull final String id) {
+    myRevNumber = revNumber;
+    myId = id;
+  }
+
+  /**
+   * Constructor for version in the form revnum:changeset_id or just changeset_id (in this case rev number is set to -1)
+   * @param fullVersion full changeset version as reported by hg log command
+   */
+  public ChangeSetRevision(@NotNull final String fullVersion) {
+    try {
+      int colon = fullVersion.indexOf(":");
+      if (colon != -1) {
+        myRevNumber = Integer.parseInt(fullVersion.substring(0, colon));
+        myId = fullVersion.substring(colon+1);
+      } else {
+        myRevNumber = -1;
+        myId = fullVersion;
+      }
+    } catch (Throwable e) {
+      throw new IllegalArgumentException(e);
+    }
+  }
+
+  /**
+   * Returns changeset revision id
+   * @return changeset revision id
+   */
+  @NotNull
+  public String getId() {
+    return myId;
+  }
+
+  /**
+   * Returns changeset revision number
+   * @return changeset revision number
+   */
+  public int getRevNumber() {
+    return myRevNumber;
+  }
+
+  /**
+   * Returns full changeset version as reported by hg log command: revnum:revid
+   * @return full changeset version as reported by hg log
+   */
+  @NotNull
+  public String getFullVersion() {
+    return myRevNumber + ":" + myId;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    final ChangeSetRevision that = (ChangeSetRevision) o;
+
+    return myRevNumber == that.myRevNumber && myId.equals(that.myId);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = myRevNumber;
+    result = 31 * result + myId.hashCode();
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "change:" + myId;
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangedFilesCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangedFilesCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,75 +1,75 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.util.FileUtil;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author Pavel.Sher
- */
-public class ChangedFilesCommand extends BaseCommand {
-  private String myRevId;
-
-  public ChangedFilesCommand(@NotNull Settings settings, @NotNull File workingDir) {
-    super(settings, workingDir);
-  }
-
-  public void setRevId(@NotNull final String revId) {
-    myRevId = revId;
-  }
-
-  public List<ModifiedFile> execute() throws VcsException {
-    File styleFile;
-    try {
-      styleFile = getStyleFile();
-    } catch (IOException e) {
-      throw new VcsException("Unable to create style file: " + e.toString(), e);
-    }
-    try {
-      GeneralCommandLine cli = createCommandLine();
-      cli.addParameter("log");
-      cli.addParameter("-r");
-      cli.addParameter(myRevId + ":" + myRevId);
-      cli.addParameter("--style=" + styleFile.getAbsolutePath());
-
-      CommandResult res = runCommand(cli);
-      return parseFiles(res.getStdout());
-    } finally {
-      FileUtil.delete(styleFile);
-    }
-  }
-
-  private File getStyleFile() throws IOException {
-    File styleFile = FileUtil.createTempFile("hg", "style");
-    FileUtil.writeFile(styleFile,
-            "changeset = \"{file_mods}{file_adds}{file_dels}\"\n" +
-            "file_add = \"A {file_add}\\n\"\n" +
-            "file_del = \"R {file_del}\\n\"\n" +
-            "file_mod = \"M {file_mod}\\n\"");
-    return styleFile;
-  }
-
-  private List<ModifiedFile> parseFiles(final String stdout) {
-    return StatusCommand.parseFiles(stdout);
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import jetbrains.buildServer.util.FileUtil;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Pavel.Sher
+ */
+public class ChangedFilesCommand extends VcsRootCommand {
+  private String myRevId;
+
+  public ChangedFilesCommand(@NotNull Settings settings, @NotNull File workingDir) {
+    super(settings, workingDir);
+  }
+
+  public void setRevId(@NotNull final String revId) {
+    myRevId = revId;
+  }
+
+  public List<ModifiedFile> execute() throws VcsException {
+    File styleFile;
+    try {
+      styleFile = getStyleFile();
+    } catch (IOException e) {
+      throw new VcsException("Unable to create style file: " + e.toString(), e);
+    }
+    try {
+      GeneralCommandLine cli = createCommandLine();
+      cli.addParameter("log");
+      cli.addParameter("-r");
+      cli.addParameter(myRevId + ":" + myRevId);
+      cli.addParameter("--style=" + styleFile.getAbsolutePath());
+
+      CommandResult res = runCommand(cli);
+      return parseFiles(res.getStdout());
+    } finally {
+      FileUtil.delete(styleFile);
+    }
+  }
+
+  private File getStyleFile() throws IOException {
+    File styleFile = FileUtil.createTempFile("hg", "style");
+    FileUtil.writeFile(styleFile,
+            "changeset = \"{file_mods}{file_adds}{file_dels}\"\n" +
+            "file_add = \"A {file_add}\\n\"\n" +
+            "file_del = \"R {file_del}\\n\"\n" +
+            "file_mod = \"M {file_mod}\\n\"");
+    return styleFile;
+  }
+
+  private List<ModifiedFile> parseFiles(final String stdout) {
+    return StatusCommand.parseFiles(stdout);
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,79 +1,81 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-
-public class CloneCommand extends BaseCommand{
-  private String myToId;
-  private boolean myUpdateWorkingDir = true;
-  private String myRepository;
-  private File myWorkingDir;
-  private boolean myUsePullProtocol = true;
-
-  public CloneCommand(@NotNull Settings settings, @NotNull File workingDir) {
-    super(settings, workingDir);
-    myWorkingDir = workingDir;
-    myRepository = getSettings().getRepositoryUrl();
-  }
-
-  /**
-   * Sets repository to clone, by default uses repository from the specified settings
-   * @param repo repository path
-   */
-  public void setRepository(@NotNull String repo) {
-    myRepository = repo;
-  }
-
-  public void setToId(final String toId) {
-    myToId = toId;
-  }
-
-  public void setUpdateWorkingDir(final boolean updateWorkingDir) {
-    myUpdateWorkingDir = updateWorkingDir;
-  }
-
-  public void setUsePullProtocol(boolean usePullProtocol) {
-    myUsePullProtocol = usePullProtocol;
-  }
-
-  public void execute() throws VcsException {
-    GeneralCommandLine cli = createCommandLine();
-    File parent = myWorkingDir.getParentFile();
-    cli.setWorkDirectory(parent.getAbsolutePath());
-    cli.addParameter("clone");
-    if (myToId != null) {
-      cli.addParameter("-r");
-      cli.addParameter(myToId);
-    }
-    if (myUsePullProtocol)
-      cli.addParameter("--pull");
-    if (!myUpdateWorkingDir) {
-      cli.addParameter("-U");
-    }
-    if (getSettings().isUncompressedTransfer()) {
-      cli.addParameter("--uncompressed");
-    }
-    cli.addParameter(myRepository);
-    cli.addParameter(myWorkingDir.getName());
-
-    runCommand(cli, 24*3600); // some repositories are quite large, we set timeout to 24 hours
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandExecutionSettingsBuilder.with;
+
+public class CloneCommand extends VcsRootCommand {
+  private String myToId;
+  private boolean myUpdateWorkingDir = true;
+  private String myRepository;
+  private File myWorkingDir;
+  private boolean myUsePullProtocol = true;
+
+  public CloneCommand(@NotNull Settings settings, @NotNull File workingDir) {
+    super(settings, workingDir);
+    myWorkingDir = workingDir;
+    myRepository = getSettings().getRepositoryUrlWithCredentials();
+  }
+
+  /**
+   * Sets repository to clone, by default uses repository from the specified settings
+   * @param repo repository path
+   */
+  public void setRepository(@NotNull String repo) {
+    myRepository = repo;
+  }
+
+  public void setToId(final String toId) {
+    myToId = toId;
+  }
+
+  public void setUpdateWorkingDir(final boolean updateWorkingDir) {
+    myUpdateWorkingDir = updateWorkingDir;
+  }
+
+  public void setUsePullProtocol(boolean usePullProtocol) {
+    myUsePullProtocol = usePullProtocol;
+  }
+
+  public void execute() throws VcsException {
+    GeneralCommandLine cli = createCommandLine();
+    File parent = myWorkingDir.getParentFile();
+    cli.setWorkDirectory(parent.getAbsolutePath());
+    cli.addParameter("clone");
+    if (myToId != null) {
+      cli.addParameter("-r");
+      cli.addParameter(myToId);
+    }
+    if (myUsePullProtocol)
+      cli.addParameter("--pull");
+    if (!myUpdateWorkingDir) {
+      cli.addParameter("-U");
+    }
+    if (getSettings().isUncompressedTransfer()) {
+      cli.addParameter("--uncompressed");
+    }
+    cli.addParameter(myRepository);
+    cli.addParameter(myWorkingDir.getName());
+
+    runCommand(cli, with().timeout(24 * 3600)); // some repositories are quite large, we set timeout to 24 hours
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandExecutionSettings.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,40 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+
+/**
+ * @author dmitry.neverov
+ */
+public class CommandExecutionSettings {
+
+  private final int myTimeout;
+  private final Set<String> myPrivateData;
+  private final boolean myCheckForFailure;
+  private final boolean myFailWhenStderrNotEmpty;
+
+  CommandExecutionSettings(int timeout, @NotNull Set<String> privateData, boolean checkForFailure, boolean failWhenStderrNotEmpty) {
+    myTimeout = timeout;
+    myPrivateData = privateData;
+    myCheckForFailure = checkForFailure;
+    myFailWhenStderrNotEmpty = failWhenStderrNotEmpty;
+  }
+
+  public int timeout() {
+    return myTimeout;
+  }
+
+  @NotNull
+  public Set<String> privateData() {
+    return myPrivateData;
+  }
+
+  public boolean shouldCheckForFailure() {
+    return myCheckForFailure;
+  }
+
+  public boolean shouldFailWithNonEmptyStderr() {
+    return myFailWhenStderrNotEmpty;
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandExecutionSettingsBuilder.java	Wed Feb 15 13:23:53 2012 +0400
@@ -0,0 +1,47 @@
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * @author dmitry.neverov
+ */
+public class CommandExecutionSettingsBuilder {
+
+  private static final int DEFAULT_COMMAND_TIMEOUT_SEC = 3600;
+
+  private int myTimeout = DEFAULT_COMMAND_TIMEOUT_SEC;
+  private Set<String> myPrivateData = Collections.emptySet();
+  private boolean myCheckForFailure = true;
+  private boolean myFailWhenStderrNotEmpty = false;
+
+  public static CommandExecutionSettingsBuilder with() {
+    return new CommandExecutionSettingsBuilder();
+  }
+
+  public CommandExecutionSettings build() {
+    return new CommandExecutionSettings(myTimeout, myPrivateData, myCheckForFailure, myFailWhenStderrNotEmpty);
+  }
+
+  public CommandExecutionSettingsBuilder timeout(int timeout) {
+    myTimeout = timeout;
+    return this;
+  }
+
+  public CommandExecutionSettingsBuilder privateData(@NotNull Set<String> privateData) {
+    myPrivateData = privateData;
+    return this;
+  }
+
+  public CommandExecutionSettingsBuilder checkForFailure(boolean checkForFailure) {
+    myCheckForFailure = checkForFailure;
+    return this;
+  }
+
+  public CommandExecutionSettingsBuilder failureWhenStderrNotEmpty() {
+    myFailWhenStderrNotEmpty = true;
+    return this;
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,24 +1,37 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
+import com.intellij.openapi.diagnostic.Logger;
 import jetbrains.buildServer.ExecResult;
+import jetbrains.buildServer.util.StringUtil;
+import jetbrains.buildServer.vcs.VcsException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
 import java.util.Set;
 
+import static com.intellij.openapi.util.text.StringUtil.isEmpty;
 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandUtil.removePrivateData;
 
 /**
- * Decorator for ExecResult that filters out private data from stdout and strerr.
+ * Mercurial command result. Filters out private data from stdout and detects errors.
  *
  * @author dmitry.neverov
  */
 public class CommandResult {
 
+  private final Logger myLogger;
+  private final String myCommand;
   private final ExecResult myDelegate;
   private final Set<String> myPrivateData;
 
-  public CommandResult(@NotNull final ExecResult execResult, @NotNull final Set<String> privateData) {
+  public CommandResult(@NotNull Logger logger, @NotNull String command, @NotNull ExecResult execResult) {
+    this(logger, command, execResult, Collections.<String>emptySet());
+  }
+
+  public CommandResult(@NotNull Logger logger, @NotNull String command, @NotNull ExecResult execResult, @NotNull Set<String> privateData) {
+    myLogger = logger;
+    myCommand = command;
     myDelegate = execResult;
     myPrivateData = privateData;
   }
@@ -28,18 +41,125 @@
     return removePrivateData(myDelegate.getStdout(), myPrivateData);
   }
 
+  public void checkCommandFailed() throws VcsException {
+    checkFailure(false);
+  }
+
+  public void checkFailure(boolean failWhenStderrIsNonEmpty) throws VcsException {
+    rethrowDetectedError();
+    if (isFailure())
+      logAndThrowError();
+    String stderr = getStderr();
+    if (!isEmpty(stderr)) {
+      if (failWhenStderrIsNonEmpty)
+        logAndThrowError();
+      else
+        logStderr(stderr);
+    }
+  }
+
+  private void logAndThrowError() throws VcsException {
+    String message = createCommandLogMessage();
+    myLogger.warn(message);
+    if (hasImportantException())
+      myLogger.error("Error during executing '" + getCommand() + "'", getException());
+    throw new VcsException(message);
+  }
+
+  private void logStderr(String stderr) {
+    myLogger.warn("Error output produced by: " + getCommand());
+    myLogger.warn(stderr);
+  }
+
   @NotNull
-  public String getStderr() {
+  private String getStderr() {
     return removePrivateData(myDelegate.getStderr(), myPrivateData);
   }
 
   @Nullable
-  public Throwable getException() {
+  private Throwable getException() {
     return myDelegate.getException();
   }
 
-  public int getExitCode() {
-    return myDelegate.getExitCode();
+  private boolean isFailure() {
+    //A non-zero exit code is not an error:
+    //http://mercurial.selenic.com/bts/issue186
+    //http://mercurial.selenic.com/bts/issue2189
+    //E.g. pull command in hg 2.1 exits with 1 if no new changes were pulled
+    return getException() != null;
+  }
+
+  private boolean shouldDetectErrors() {
+    return isFailure() || myDelegate.getExitCode() != 0;
+  }
+
+  @NotNull
+  private String getCommand() {
+    return removePrivateData(myCommand, myPrivateData);
+  }
+
+  private boolean hasImportantException() {
+    Throwable exception = getException();
+    return exception instanceof NullPointerException;
+  }
+
+  private String createCommandLogMessage() {
+    String stderr = getStderr();
+    String stdout = getStdout();
+    String exceptionMessage = getExceptionMessage();
+    return "'" + getCommand() + "' command failed.\n" +
+            (!StringUtil.isEmpty(stdout) ? "stdout: " + stdout + "\n" : "") +
+            (!StringUtil.isEmpty(stderr) ? "stderr: " + stderr + "\n" : "") +
+            (exceptionMessage != null ? "exception: " + exceptionMessage : "");
+  }
+
+  @Nullable
+  private String getExceptionMessage() {
+    Throwable exception = getException();
+    if (exception == null)
+      return null;
+    String message = exception.getMessage();
+    if (message == null)
+      message = exception.getClass().getName();
+    return message;
+  }
+
+  private void rethrowDetectedError() throws VcsException {
+    if (!shouldDetectErrors())
+      return;
+    String stderr = getStderr().trim();
+    checkUnrelatedRepository(stderr);
+    checkUnknownRevision(stderr);
+    checkFileNotUnderTheRoot(stderr);
+  }
+
+  private void checkUnrelatedRepository(@NotNull final String stderr) throws UnrelatedRepositoryException {
+    if (stderr.contains("abort: repository is unrelated"))
+      throw new UnrelatedRepositoryException();
+  }
+
+  private void checkUnknownRevision(@NotNull final String stderr) throws UnknownRevisionException {
+    final String message = "abort: unknown revision '";
+    int idx = stderr.indexOf(message);
+    if (idx != -1) {
+      int startIdx = idx + message.length();
+      int endIdx = stderr.indexOf("'", startIdx);
+      String revision = stderr.substring(startIdx, endIdx);
+      throw new UnknownRevisionException(revision);
+    }
+  }
+
+  private void checkFileNotUnderTheRoot(@NotNull final String stderr) throws VcsException {
+    final String prefix = "abort: ";
+    int idx = stderr.indexOf("abort: ");
+    if (idx != -1) {
+      int startIdx = idx + prefix.length();
+      int endIdx = stderr.indexOf(" not under root");
+      if (endIdx != -1) {
+        String path = stderr.substring(startIdx, endIdx);
+        throw new UnknownFileException(path);
+      }
+    }
   }
 
   public byte[] getByteOut() {

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandUtil.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,138 +1,73 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.ExecResult;
-import jetbrains.buildServer.SimpleCommandLineProcessRunner;
-import jetbrains.buildServer.log.Loggers;
-import jetbrains.buildServer.util.StringUtil;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class CommandUtil {
-  public static final int DEFAULT_COMMAND_TIMEOUT_SEC = 3600;
-
-  public static void checkCommandFailed(@NotNull String cmdName, @NotNull CommandResult res) throws VcsException {
-    checkCommandFailed(cmdName, res, false);
-  }
-
-  private static void checkCommandFailed(@NotNull String cmdName, @NotNull CommandResult res, boolean logErrorsInDebug) throws VcsException {
-    if (logErrorsInDebug) {
-      if (res.getExitCode() != 0 || res.getException() != null)
-        Loggers.VCS.debug(createCommandLogMessage(cmdName, res));
-    } else {
-      if (res.getExitCode() != 0 || res.getException() != null)
-        commandFailed(cmdName, res);
-      if (res.getStderr().length() > 0) {
-        Loggers.VCS.warn("Error output produced by: " + cmdName);
-        Loggers.VCS.warn(res.getStderr());
-      }
-    }
-  }
-
-  public static void commandFailed(final String cmdName, final CommandResult res) throws VcsException {
-    final String message = createCommandLogMessage(cmdName, res);
-    Loggers.VCS.warn(message);
-    if (hasImportantException(res)) {
-      Loggers.VCS.error("Error during executing '" + cmdName + "'", res.getException());
-    }
-    throw new VcsException(message);
-  }
-
-  private static String createCommandLogMessage(final String cmdName, final CommandResult res) {
-    String stderr = res.getStderr();
-    String stdout = res.getStdout();
-    String exceptionMessage = getExceptionMessage(res);
-    return "'" + cmdName + "' command failed.\n" +
-            (!StringUtil.isEmpty(stdout) ? "stdout: " + stdout + "\n" : "") +
-            (!StringUtil.isEmpty(stderr) ? "stderr: " + stderr + "\n" : "") +
-            (exceptionMessage != null ? "exception: " + exceptionMessage : "");
-  }
-
-  @Nullable
-  private static String getExceptionMessage(CommandResult result) {
-    Throwable exception = result.getException();
-    String message = null;
-    if (exception != null) {
-      message = exception.getMessage();
-      if (message == null) {
-        message = exception.getClass().getName();
-      }
-    }
-    return message;
-  }
-
-  private static boolean hasImportantException(CommandResult result) {
-    Throwable exception = result.getException();
-    if (exception != null) {
-      return exception instanceof NullPointerException;
-    } else {
-      return false;
-    }
-  }
-
-  public static CommandResult runCommand(@NotNull GeneralCommandLine cli) throws VcsException {
-    return runCommand(cli, DEFAULT_COMMAND_TIMEOUT_SEC, Collections.<String>emptySet());
-  }
-
-  public static CommandResult runCommand(@NotNull GeneralCommandLine cli, @NotNull Set<String> privateData) throws VcsException {
-    return runCommand(cli, DEFAULT_COMMAND_TIMEOUT_SEC, privateData);
-  }
-
-  public static CommandResult runCommand(@NotNull GeneralCommandLine cli, final int executionTimeout, @NotNull Set<String> privateData) throws VcsException {
-    return runCommand(cli, executionTimeout, privateData, false);
-  }
-
-  public static CommandResult runCommand(@NotNull GeneralCommandLine cli, final int executionTimeout, @NotNull Set<String> privateData, boolean logErrorsInDebug) throws VcsException {
-    final String cmdStr = removePrivateData(cli.getCommandLineString(), privateData);
-    Loggers.VCS.debug("Run command: " + cmdStr);
-    CommandResult res = run(cli, executionTimeout, cmdStr, privateData);
-    CommandUtil.checkCommandFailed(cmdStr, res, logErrorsInDebug);
-    Loggers.VCS.debug("Command " + cmdStr + " output:\n" + res.getStdout());
-    return res;
-  }
-
-  private static CommandResult run(@NotNull final GeneralCommandLine cli, final int executionTimeout, @NotNull final String cmdStr, @NotNull final Set<String> privateData) {
-    final long start = System.currentTimeMillis();
-    ExecResult res = SimpleCommandLineProcessRunner.runCommand(cli, null, new SimpleCommandLineProcessRunner.RunCommandEventsAdapter() {
-      @Override
-      public Integer getOutputIdleSecondsTimeout() {
-        return executionTimeout;
-      }
-      @Override
-      public void onProcessFinished(Process ps) {
-        long duration = System.currentTimeMillis() - start;
-        Loggers.VCS.debug("Command " + cmdStr + " took " + duration + "ms");
-      }
-    });
-    return new CommandResult(res, privateData);
-  }
-
-  public static String removePrivateData(final String str, final Set<String> privateData) {
-    String result = str;
-    for (String data: privateData) {
-      if (data == null || data.length() == 0) continue;
-      result = result.replace(data, "******");
-    }
-
-    return result;
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import jetbrains.buildServer.ExecResult;
+import jetbrains.buildServer.SimpleCommandLineProcessRunner;
+import jetbrains.buildServer.log.Loggers;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandExecutionSettingsBuilder.with;
+
+public class CommandUtil {
+
+  public static CommandResult runCommand(@NotNull GeneralCommandLine cli) throws VcsException {
+    return runCommand(cli, with());
+  }
+
+  public static CommandResult runCommand(@NotNull GeneralCommandLine cli, @NotNull CommandExecutionSettingsBuilder executionSettingsBuilder) throws VcsException {
+    return runCommand(cli, executionSettingsBuilder.build());
+  }
+
+  private static CommandResult runCommand(@NotNull GeneralCommandLine cli, @NotNull CommandExecutionSettings executionSettings) throws VcsException {
+    final String command = removePrivateData(cli.getCommandLineString(), executionSettings.privateData());
+    Loggers.VCS.debug("Run command: " + command);
+    CommandResult res = run(cli, executionSettings.timeout(), command, executionSettings.privateData());
+    if (executionSettings.shouldCheckForFailure() || executionSettings.shouldFailWithNonEmptyStderr())
+      res.checkFailure(executionSettings.shouldFailWithNonEmptyStderr());
+    Loggers.VCS.debug("Command " + command + " output:\n" + res.getStdout());
+    return res;
+  }
+
+  private static CommandResult run(@NotNull final GeneralCommandLine cli, final int executionTimeout, @NotNull final String command, @NotNull final Set<String> privateData) {
+    final long start = System.currentTimeMillis();
+    ExecResult res = SimpleCommandLineProcessRunner.runCommand(cli, null, new SimpleCommandLineProcessRunner.RunCommandEventsAdapter() {
+      @Override
+      public Integer getOutputIdleSecondsTimeout() {
+        return executionTimeout;
+      }
+      @Override
+      public void onProcessFinished(Process ps) {
+        long duration = System.currentTimeMillis() - start;
+        Loggers.VCS.debug("Command " + command + " took " + duration + "ms");
+      }
+    });
+    return new CommandResult(Loggers.VCS, command, res, privateData);
+  }
+
+  public static String removePrivateData(final String str, final Set<String> privateData) {
+    String result = str;
+    for (String data: privateData) {
+      if (data == null || data.length() == 0) continue;
+      result = result.replace(data, "******");
+    }
+    return result;
+  }
+}

--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java	Wed Feb 15 12:07:12 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java	Wed Feb 15 13:23:53 2012 +0400
@@ -1,61 +1,71 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
-
-import com.intellij.execution.configurations.GeneralCommandLine;
-import jetbrains.buildServer.vcs.VcsException;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-
-/**
- * @author Pavel.Sher
- *         Date: 16.07.2008
- */
-public class IdentifyCommand extends BaseCommand {
-
-  private boolean myInLocalRepository = false;
-  private ChangeSet myChangeSet;
-
-  public IdentifyCommand(@NotNull Settings settings, @NotNull File workingDir) {
-    super(settings, workingDir);
-  }
-
-  public void setInLocalRepository(boolean inLocalRepository) {
-    myInLocalRepository = inLocalRepository;
-  }
-
-  public void setChangeSet(ChangeSet changeSet) {
-    myChangeSet = changeSet;
-  }
-
-  public String execute() throws VcsException {
-    GeneralCommandLine cli = createCL();
-    cli.addParameter("identify");
-    if (myInLocalRepository) {
-      cli.setWorkDirectory(this.getWorkDirectory());
-    } else {
-      cli.addParameter(getSettings().getRepositoryUrl());
-    }
-    if (myChangeSet != null) {
-      cli.addParameter("--rev");
-      cli.addParameter(myChangeSet.getId());
-    }
-    CommandResult res = runCommand(cli);
-    failIfNotEmptyStdErr(cli, res);
-    return res.getStdout();
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
+
+import com.intellij.execution.configurations.GeneralCommandLine;
+import jetbrains.buildServer.vcs.VcsException;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+
+import static jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandExecutionSettingsBuilder.with;
+
+/**
+ * @author Pavel.Sher
+ *         Date: 16.07.2008
+ */
+public class IdentifyCommand extends VcsRootCommand {
+
+  private boolean myInLocalRepository = false;
+  private ChangeSet myChangeSet;
+  private Integer myRevisionNumber;
+
+  public IdentifyCommand(@NotNull Settings settings, @NotNull File workingDir) {
+    super(settings, workingDir);
+  }
+
+  public void setInLocalRepository(boolean inLocalRepository) {
+    myInLocalRepository = inLocalRepository;
+  }
+
+  public void setChangeSet(ChangeSet changeSet) {
+    myChangeSet = changeSet;
+  }
+
+  public void setRevisionNumber(int revisionNumber) {
+    myRevisionNumber = revisionNumber;
+  }
+
+  public String execute() throws VcsException {
+    GeneralCommandLine cli = createCL();
+    cli.addParameter("identify");
+    if (myInLocalRepository) {
+      cli.setWorkDirectory(this.getWorkDirectory().getAbsolutePath());
+    } else {
+      cli.addParameter(getSettings().getRepositoryUrlWithCredentials());
+    }
+    if (myChangeSet != null) {
+      cli.addParameter("--rev");
+      cli.addParameter(myChangeSet.getId());
+    } else if (myRevisionNumber != null) {
+      cli.addParameter("--rev");
+      cli.addParameter(myRevisionNumber.toString());
+    }
+    CommandResult res = runCommand(cli, with().failureWhenStderrNotEmpty());
+    String output = res.getStdout().trim();
+    return output.contains(" ") ? output.substring(0, output.indexOf(" ")) : output;
+  }
+}