--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Fri May 30 11:10:19 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Fri May 30 11:16:38 2014 +0200
@@ -29,7 +29,6 @@
  */
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
-import com.intellij.execution.configurations.GeneralCommandLine;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.OS;
 import jetbrains.buildServer.util.FileUtil;
 import jetbrains.buildServer.vcs.VcsException;
@@ -93,39 +92,25 @@
     final MercurialCommandLine cli = createCommandLine();
 
     addHttpAuthParams(cli);
-    cli.addParameter("archive");
-    setType(cli);
-    setRevision(cli);
-    addIncludeRules(cli);
-    setDestination(cli);
-    return cli;
-  }
 
-  private void addIncludeRules(@NotNull MercurialCommandLine cli) {
-    if (myIncludeRules.isEmpty())
-      return;
-    for (String include : myIncludeRules) {
-      cli.addParameter("-I");
-      cli.addParameter(include);
-    }
-  }
+    cli.addParameter("archive");
+    cli.addParameter("-t");
+    cli.addParameter(myType);
+    cli.addParameter("-r");
 
-  private void setDestination(GeneralCommandLine cli) {
-    cli.addParameter(myDestination.getAbsolutePath());
-  }
-
-  private void setRevision(GeneralCommandLine cli) {
-    cli.addParameter("-r");
     if (myToId != null) {
       cli.addParameter(myToId);
     } else {
       cli.addParameter("tip");
     }
-  }
 
-  private void setType(GeneralCommandLine cli) {
-    cli.addParameter("-t");
-    cli.addParameter(myType);
+    for (String include : myIncludeRules) {
+      cli.addParameter("-I");
+      cli.addParameter(include);
+    }
+    cli.addParameter(myDestination.getAbsolutePath());
+
+    return cli;
   }
 
   /**