changeset 73:c605a48ab650

fixing checkout rules on agent side
author Pavel.Sher
date Wed, 29 Jul 2009 15:08:53 +0400
parents 8a9c3aa7e115
children ac1dceb37faa a74563111be4
files mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java
diffstat 2 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java	Wed Jul 29 13:12:54 2009 +0400
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java	Wed Jul 29 15:08:53 2009 +0400
@@ -35,9 +35,8 @@
       }
     }
 
-    File actualWorkingDir = getWorkingDir(workingDir, includeRule);
-    Settings settings = new Settings(actualWorkingDir, vcsRoot);
-    settings.setWorkingDir(actualWorkingDir);
+    Settings settings = new Settings(workingDir, vcsRoot);
+    settings.setWorkingDir(workingDir);
     if (settings.hasCopyOfRepository()) {
       // execute pull command
       logger.message("Repository in working directory found, start pulling changes");
@@ -49,16 +48,16 @@
       logger.message("No repository in working directory found, start cloning repository to temporary folder");
       File parentDir = cloneRepository(settings);
       logger.message("Repository successfully cloned to: " + parentDir.getAbsolutePath());
-      logger.message("Moving repository to working directory: " + actualWorkingDir.getAbsolutePath());
-      if (!moveDir(parentDir, actualWorkingDir)) {
-        File hgDir = new File(actualWorkingDir, ".hg");
+      logger.message("Moving repository to working directory: " + workingDir.getAbsolutePath());
+      if (!moveDir(parentDir, workingDir)) {
+        File hgDir = new File(workingDir, ".hg");
         if (hgDir.isDirectory()) {
           FileUtil.delete(hgDir);
         }
-        throw new VcsException("Failed to move directory content: " + parentDir.getAbsolutePath() + " to: " + actualWorkingDir.getAbsolutePath());
+        throw new VcsException("Failed to move directory content: " + parentDir.getAbsolutePath() + " to: " + workingDir.getAbsolutePath());
       }
 
-      logger.message("Repository successfully moved to working directory: " + actualWorkingDir.getAbsolutePath());
+      logger.message("Repository successfully moved to working directory: " + workingDir.getAbsolutePath());
     }
     updateWorkingDir(settings, version, logger);
   }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Wed Jul 29 13:12:54 2009 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Wed Jul 29 15:08:53 2009 +0400
@@ -53,9 +53,9 @@
   }
 
   private File doUpdate(final VcsRoot vcsRoot, final String version, final IncludeRule includeRule) throws VcsException {
-    myVcsSupport.updateSources((BuildProgressLogger) myProgressLoggerMock.proxy(), myWorkDir, vcsRoot, version, includeRule);
+    File actualWorkDir = new File(myWorkDir, includeRule.getTo());
+    myVcsSupport.updateSources((BuildProgressLogger) myProgressLoggerMock.proxy(), actualWorkDir, vcsRoot, version, includeRule);
 
-    File actualWorkDir = new File(myWorkDir, includeRule.getTo());
     File hgDir = new File(actualWorkDir, ".hg");
     assertTrue(hgDir.isDirectory());
     return actualWorkDir;