[JENKINS-50287] allow to select two different behaviours for as-it-is…

… checkout (#215) * [JENKINS-50287] allow to select two different behaviours for as-it-is checkout
jenkinsci · May 8, 2018 · 8903421 · 8903421
1 parent fc18211
commit 8903421
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 4 deletions.
diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java
@@ -2975,8 +2975,10 @@ public SVNDepth getSvnDepthForUpdate() {
          * @return {@link org.tmatesoft.svn.core.SVNDepth} value.
          */
         public SVNDepth getSvnDepthForCheckout() {
-            if(getDepthOption().equals("unknown")) {
+            if("unknown".equals(getDepthOption())) {
                 return SVNDepth.FILES;
+            } else if ("as-it-is-infinity".equals(getDepthOption())){
+                return SVNDepth.INFINITY;
             } else {
                 return getSvnDepth(getDepthOption());
             }
@@ -2991,9 +2993,9 @@ public SVNDepth getSvnDepthForCheckout() {
          * @return {@link org.tmatesoft.svn.core.SVNDepth} value.
          */
         public SVNDepth getSvnDepthForRevert() {
-            if(getDepthOption().equals("unknown")) {
+            if("unknown".equals(getDepthOption()) || "as-it-is-infinity".equals(getDepthOption())){
                 return SVNDepth.INFINITY;
-            } else {
+            }else {
                 return getSvnDepth(getDepthOption());
             }
         }

diff --git a/src/main/resources/hudson/scm/SubversionSCM/ModuleLocation/config.jelly b/src/main/resources/hudson/scm/SubversionSCM/ModuleLocation/config.jelly
@@ -49,7 +49,8 @@ THE SOFTWARE.
       <f:option value="empty" selected="${instance.depthOption=='empty'}">empty</f:option>
       <f:option value="files" selected="${instance.depthOption=='files'}">files</f:option>
       <f:option value="immediates" selected="${instance.depthOption=='immediates'}">immediates</f:option>
-      <f:option value="unknown" selected="${instance.depthOption=='unknown'}">as-it-is</f:option>
+      <f:option value="unknown" selected="${instance.depthOption=='unknown'}">as-it-is(checkout depth files)</f:option>
+      <f:option value="as-it-is-infinity" selected="${instance.depthOption=='as-it-is-infinity'}">as-it-is(checkout depth infinity)</f:option>
     </select>
   </f:entry>
   <f:entry title="${%Ignore externals}" field="ignoreExternalsOption">

diff --git a/src/test/java/jenkins/scm/impl/subversion/SubversionStepTest.java b/src/test/java/jenkins/scm/impl/subversion/SubversionStepTest.java
@@ -116,4 +116,52 @@ public void multipleSCMs() throws Exception {
         assertFalse(iterator.hasNext());
     }
 
+
+    @Test
+    public void checkoutDepthAsItIsInfiniteTest() throws Exception {
+        checkoutDepthTest("as-it-is-infinity");
+    }
+
+    @Test
+    public void checkoutDepthFilesTest() throws Exception {
+        checkoutDepthTest("files");
+    }
+
+    @Test
+    public void checkoutDepthUnknownTest() throws Exception {
+        checkoutDepthTest("unknown");
+    }
+
+    @Test
+    public void checkoutDepthEmptyTest() throws Exception {
+        checkoutDepthTest("empty");
+    }
+
+    @Test
+    public void checkoutDepthImmediatesTest() throws Exception {
+        checkoutDepthTest("immediates");
+    }
+
+    @Test
+    public void checkoutDepthInfinityTest() throws Exception {
+        checkoutDepthTest("infinity");
+    }
+
+    private void checkoutDepthTest(String depth) throws Exception {
+        sampleRepo.init();
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "checkoutAsItIsInfinite");
+        p.addTrigger(new SCMTrigger(""));
+        p.setQuietPeriod(3); // so it only does one build
+        p.setDefinition(new CpsFlowDefinition(
+                "node(){\n"
+                + "    ws {\n"
+                + "       dir('main'){\n"
+                + "           checkout([$class: 'SubversionSCM', locations: [[ depthOption: '" + depth + "', remote: '"
+                + sampleRepo.trunkUrl() + "']]])\n"
+                + "       } \n"
+                + "    }\n"
+                + "}"));
+        r.waitUntilNoActivity();
+        WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
+    }
 }