[JENKINS-18281] Introduced trimmed change set option

jenkinsci · Aug 22, 2013 · 4c35251 · 4c35251
1 parent 5c8ab2a
commit 4c35251
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/main/java/net/praqma/hudson/CCUCMBuildAction.java b/src/main/java/net/praqma/hudson/CCUCMBuildAction.java
@@ -43,6 +43,13 @@ public class CCUCMBuildAction implements Action {
      */
     private boolean removeViewPrivateFiles = true;
 
+    /**
+     * Determine whether to trim the change set or not.
+     *
+     * @since 1.4.0
+     */
+    private boolean trimmedChangeSet = false;
+
     /**
      * The found {@link Baseline} for the build
      */
@@ -301,6 +308,14 @@ public void setRemoveViewPrivateFiles( boolean removeViewPrivateFiles ) {
         this.removeViewPrivateFiles = removeViewPrivateFiles;
     }
 
+    public boolean isTrimmedChangeSet() {
+        return trimmedChangeSet;
+    }
+
+    public void setTrimmedChangeSet( boolean trimmedChangeSet ) {
+        this.trimmedChangeSet = trimmedChangeSet;
+    }
+
     public Exception getResolveBaselineException() {
         return resolveBaselineException;
     }

diff --git a/src/main/java/net/praqma/hudson/scm/CCUCMScm.java b/src/main/java/net/praqma/hudson/scm/CCUCMScm.java
@@ -79,6 +79,7 @@ public class CCUCMScm extends SCM {
      * Determines whether to remove the view private files or not
      */
     private boolean removeViewPrivateFiles;
+    private boolean trimmedChangeSet;
 
 	/* Old notifier fields */
 	private boolean recommend;
@@ -111,12 +112,12 @@ public CCUCMScm() {
     public CCUCMScm( String component, String levelToPoll, String loadModule, boolean newest, String polling, String stream, String treatUnstable,
                      boolean createBaseline, String nameTemplate, boolean forceDeliver, boolean recommend, boolean makeTag, boolean setDescription, String buildProject ) {
 
-        this( component, levelToPoll, loadModule, newest, polling, stream, treatUnstable, createBaseline, nameTemplate, forceDeliver, recommend, makeTag, setDescription, buildProject, true );
+        this( component, levelToPoll, loadModule, newest, polling, stream, treatUnstable, createBaseline, nameTemplate, forceDeliver, recommend, makeTag, setDescription, buildProject, true, false );
     }
 
 	@DataBoundConstructor
 	public CCUCMScm( String component, String levelToPoll, String loadModule, boolean newest, String polling, String stream, String treatUnstable, 
-			         boolean createBaseline, String nameTemplate, boolean forceDeliver, boolean recommend, boolean makeTag, boolean setDescription, String buildProject, boolean removeViewPrivateFiles ) {
+			         boolean createBaseline, String nameTemplate, boolean forceDeliver, boolean recommend, boolean makeTag, boolean setDescription, String buildProject, boolean removeViewPrivateFiles, boolean trimmedChangeSet ) {
 
 		this.component = component;
 		this.loadModule = loadModule;
@@ -131,6 +132,7 @@ public CCUCMScm( String component, String levelToPoll, String loadModule, boolea
 
 		this.forceDeliver = forceDeliver;
         this.removeViewPrivateFiles = removeViewPrivateFiles;
+        this.trimmedChangeSet = trimmedChangeSet;
 
 		this.recommend = recommend;
 		this.makeTag = makeTag;
@@ -764,6 +766,7 @@ private CCUCMBuildAction getBuildAction() throws UnableToInitializeEntityExcepti
         action.setUnstable( treatUnstable );
         action.setLoadModule( loadModule );
         action.setRemoveViewPrivateFiles( removeViewPrivateFiles );
+        action.setTrimmedChangeSet( trimmedChangeSet );
 
         /* Deliver and template */
         action.setCreateBaseline( createBaseline );
@@ -903,6 +906,10 @@ public boolean getForceDeliver() {
 		return forceDeliver;
 	}
 
+    private boolean isTrimmedChangeSet() {
+        return trimmedChangeSet;
+    }
+
     public boolean isRemoveViewPrivateFiles() {
         return removeViewPrivateFiles;
     }

diff --git a/src/main/resources/net/praqma/hudson/scm/CCUCMScm/config.jelly b/src/main/resources/net/praqma/hudson/scm/CCUCMScm/config.jelly
@@ -77,6 +77,10 @@
             <f:entry title="Remove view private files" help="/plugin/clearcase-ucm-plugin/scm/help-removeViewPrivateFiles.html">
                 <f:checkbox name="CCUCM.removeViewPrivateFiles" checked="${scm.removeViewPrivateFiles}" default="true"/>
             </f:entry>
+
+            <f:entry title="Trimmed change set" help="/plugin/clearcase-ucm-plugin/scm/help-trimmedChangeSet.html">
+                <f:checkbox name="CCUCM.trimmedChangeSet" checked="${scm.trimmedChangeSet}" default="false"/>
+            </f:entry>
 
 		    <f:entry title="Build project" help="/plugin/clearcase-ucm-plugin/scm/help-buildProject.html">
 	      		<f:textbox name="buildProject" value="${scm.buildProject}"/>

diff --git a/src/main/webapp/scm/help-trimmedChangeSet.html b/src/main/webapp/scm/help-trimmedChangeSet.html
@@ -0,0 +1,3 @@
+<div>
+When checked the change set is trimmed, only listing the latest versions from the given stream.
+</div>