Merge pull request #50 from blt04/fix-shared-working-copy-update

[FIXED JENKINS-15829] Don't recreate workspace when using Repository Sharing
jenkinsci · Feb 12, 2014 · a1839d8 · a1839d8
2 parents 182c495 + 3173ad4
commit a1839d8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCM.java b/src/main/java/hudson/plugins/mercurial/MercurialSCM.java
@@ -484,15 +484,18 @@ private boolean canReuseWorkspace(FilePath repo,
             boolean jobShouldUseSharing, AbstractBuild<?,?> build,
             Launcher launcher, BuildListener listener)
                 throws IOException, InterruptedException {
-        if (!new FilePath(repo, ".hg/hgrc").exists()) {
-            return false;
-        }
 
         boolean jobUsesSharing = new FilePath(repo, ".hg/sharedpath").exists();
         if (jobShouldUseSharing != jobUsesSharing) {
             return false;
+        } else if(jobUsesSharing) {
+            return true;
         }
 
+        if (!new FilePath(repo, ".hg/hgrc").exists()) {
+            return false;
+        }
+
         HgExe hg = new HgExe(findInstallation(getInstallation()), getCredentials(build.getProject()), launcher, build.getBuiltOn(), listener, build.getEnvironment(listener));
         try {
         String upstream = hg.config(repo, "paths.default");