changeset 18:d787c696225c

do not update local working directory
author Pavel.Sher
date Wed, 16 Jul 2008 01:48:22 +0400
parents 21b5b1c5dd74
children 40b2cf04cd4b
files mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Jul 16 01:37:35 2008 +0400
+++ b/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Jul 16 01:48:22 2008 +0400
@@ -323,6 +323,7 @@
         // clone
         CloneCommand cl = new CloneCommand(settings);
         cl.setDestDir(workDir);
+        cl.setUpdateWorkingDir(false);
         cl.execute();
       }
     }
--- a/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Wed Jul 16 01:37:35 2008 +0400
+++ b/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Wed Jul 16 01:48:22 2008 +0400
@@ -10,6 +10,7 @@
   private Settings mySettings;
   private String myDestDir;
   private String myToId;
+  private boolean myUpdateWorkingDir = true;
 
   public CloneCommand(@NotNull final Settings settings) {
     mySettings = settings;
@@ -23,6 +24,10 @@
     myToId = toId;
   }
 
+  public void setUpdateWorkingDir(final boolean updateWorkingDir) {
+    myUpdateWorkingDir = updateWorkingDir;
+  }
+
   public void execute() throws VcsException {
     if (myDestDir == null) throw new IllegalStateException("Destination dir must be specified");
     GeneralCommandLine cli = new GeneralCommandLine();
@@ -35,7 +40,10 @@
       cli.addParameter("-r");
       cli.addParameter(myToId);
     }
-    //cli.addParameter("--pull");
+    cli.addParameter("--pull");
+    if (!myUpdateWorkingDir) {
+      cli.addParameter("-U");
+    }
     cli.addParameter(mySettings.getRepository());
     cli.addParameter(dir.getName());