[JENKINS-26458] Guard against a workspace format of 100.

jenkinsci · Jul 19, 2015 · 7fd8a5a · 7fd8a5a
1 parent ad260ce
commit 7fd8a5a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/hudson/scm/subversion/CheckoutUpdater.java b/src/main/java/hudson/scm/subversion/CheckoutUpdater.java
@@ -39,6 +39,7 @@
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.internal.util.DefaultSVNDebugLogger;
+import org.tmatesoft.svn.core.internal.wc17.db.ISVNWCDb;
 import org.tmatesoft.svn.core.internal.wc2.compat.SvnCodec;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import org.tmatesoft.svn.core.wc.SVNUpdateClient;
@@ -109,6 +110,11 @@ public List<External> perform() throws IOException, InterruptedException {
                     checkout.setIgnoreExternals(location.isIgnoreExternalsOption());
                     checkout.setExternalsHandler(SvnCodec.externalsHandler(svnuc.getExternalsHandler()));
 
+                    // Statement to guard against JENKINS-26458.
+                    if (SubversionWorkspaceSelector.workspaceFormat == 100) {
+                        SubversionWorkspaceSelector.workspaceFormat = ISVNWCDb.WC_FORMAT_17;
+                    }
+
                     // Workaround for SVNKIT-430 is to set the working copy format when
                     // a checkout is performed.
                     checkout.setTargetWorkingCopyFormat(SubversionWorkspaceSelector.workspaceFormat);

diff --git a/src/test/java/hudson/scm/SVNWorkingCopyTest.java b/src/test/java/hudson/scm/SVNWorkingCopyTest.java
@@ -29,6 +29,7 @@
 import hudson.model.queue.QueueTaskFuture;
 import hudson.scm.subversion.WorkspaceUpdater;
 import hudson.scm.subversion.WorkspaceUpdaterDescriptor;
+import org.jvnet.hudson.test.Issue;
 import org.tmatesoft.svn.core.internal.wc.SVNStatusUtil;
 import org.tmatesoft.svn.core.internal.wc.admin.*;
 import org.tmatesoft.svn.core.internal.wc17.db.ISVNWCDb;
@@ -69,6 +70,12 @@ public void testCheckoutWorkingCopyFormat18() throws Exception {
     checkoutAndVerifyWithFormat(ISVNWCDb.WC_FORMAT_18);
   }
 
+    @Issue("JENKINS-26458")
+    public void testCheckoutWorkingCopyFormat100() throws Exception {
+        assertEquals("Working copy of 100 should checkout 1.7",
+                ISVNWCDb.WC_FORMAT_17, checkoutWithFormat(100));
+    }
+
   private void checkoutAndVerifyWithFormat(int format) throws Exception {
     assertEquals("Checkout and workspace format do not match", format, checkoutWithFormat(format));
   }