Jenkins-4688 - Setting disable changelog to be build specific rather

than global and adding a field into the config to allow user to change it
jenkinsci · Jan 2, 2012 · ce115fb · ce115fb
1 parent 94a850e
commit ce115fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/src/main/java/hudson/scm/CVSSCM.java b/src/main/java/hudson/scm/CVSSCM.java
@@ -121,6 +121,8 @@ public class CVSSCM extends SCM implements Serializable {
     private final CvsRepository[] repositories;
 
     private final boolean canUseUpdate;
+
+    private final boolean skipChangeLog;
 
     // start legacy fields
     @Deprecated
@@ -148,14 +150,15 @@ public CVSSCM(final String cvsRoot, final String allModules, final String branch
                     final boolean canUseUpdate, final boolean useHeadIfNotFound, final boolean legacy,
                     final boolean isTag, final String excludedRegions) {
         this(convertLegacyConfigToRepositoryStructure(cvsRoot, allModules, branch, isTag, excludedRegions,
-                        useHeadIfNotFound), canUseUpdate, legacy, null);
+                useHeadIfNotFound), canUseUpdate, legacy, null, Boolean.getBoolean(CVSSCM.class.getName() + ".skipChangeLog"));
     }
 
     @DataBoundConstructor
     public CVSSCM(final List<CvsRepository> repositories, final boolean canUseUpdate, final boolean legacy,
-                    final CVSRepositoryBrowser browser) {
+                    final CVSRepositoryBrowser browser, final boolean skipChangeLog) {
         this.repositories = repositories.toArray(new CvsRepository[repositories.size()]);
         this.canUseUpdate = canUseUpdate;
+        this.skipChangeLog = skipChangeLog;
         flatten = !legacy && this.repositories.length == 1 && this.repositories[0].getModules().length == 1;
         repositoryBrowser = browser;
     }
@@ -612,6 +615,11 @@ public ChangeLogParser createChangeLogParser() {
     public boolean getCanUseUpdate() {
         return canUseUpdate;
     }
+
+    @Exported
+    public boolean isSkipChangeLog() {
+        return skipChangeLog;
+    }
 
     @Exported
     public boolean isFlatten() {
@@ -765,7 +773,7 @@ public Boolean invoke(final File workspace, final VirtualChannel channel) throws
         // build change log
         final Build<?, ?> lastCompleteBuild = (Build<?, ?>) build.getPreviousBuiltBuild();
 
-        if (lastCompleteBuild != null && !getDescriptor().isSkipChangeLog()) {
+        if (lastCompleteBuild != null && !isSkipChangeLog()) {
             final List<CVSChangeLog> changes = new ArrayList<CVSChangeLog>();
             for (CvsRepository location : repositories) {
                 changes.addAll(calculateChangeLog(lastCompleteBuild.getTime(), build.getTime(), location, launcher,
@@ -908,8 +916,6 @@ private class RepositoryBrowser {
          */
         private int compressionLevel = 3;
 
-        private boolean skipChangeLog;
-
         public DescriptorImpl() {
             super(CVSRepositoryBrowser.class);
             load();
@@ -936,31 +942,18 @@ public void setCompressionLevel(final int compressionLevel) {
             this.compressionLevel = compressionLevel;
         }
 
-        public boolean isSkipChangeLog() {
-            return skipChangeLog;
-        }
-
-        public void setSkipChangeLog(final boolean shouldSkipChangeLog) {
-            skipChangeLog = shouldSkipChangeLog;
-        }
-
         @Override
         public void load() {
             super.load();
             // used to move to the new data structure
             if (noCompression) {
                 compressionLevel = 0;
             }
-
-            if (Boolean.getBoolean(CVSSCM.class.getName() + ".skipChangeLog")) {
-                skipChangeLog = true;
-            }
         }
 
         @Override
         public boolean configure(final StaplerRequest req, final JSONObject o) {
             String compressionLevel = fixEmptyAndTrim(o.getString("cvsCompression"));
-            skipChangeLog = Boolean.parseBoolean(o.getString("skipChangeLog"));
 
             try {
                 this.compressionLevel = Integer.parseInt(compressionLevel);

diff --git a/src/main/resources/hudson/scm/CVSSCM/config.jelly b/src/main/resources/hudson/scm/CVSSCM/config.jelly
@@ -123,6 +123,9 @@ THE SOFTWARE.
     <f:entry title="${%Use Update}">
        <f:checkbox name="canUseUpdate" checked="${instance.canUseUpdate}" />
     </f:entry>
+    <f:entry title="${%Skip Changelog}">
+       <f:checkbox name="skipChangeLog" checked="${instance.skipChangeLog}" />
+    </f:entry>
     <f:entry  title="${%Legacy Mode}">
         <f:checkbox name="legacy" checked="${instance.legacy}" title="${%legacyModeDescription}" />
     </f:entry>

diff --git a/src/test/java/hudson/scm/CVSSCMTest.java b/src/test/java/hudson/scm/CVSSCMTest.java
@@ -70,11 +70,9 @@ public void testGlobalConfigRoundtrip() throws Exception {
         CVSSCM.DescriptorImpl d = hudson
                         .getDescriptorByType(CVSSCM.DescriptorImpl.class);
         d.setCompressionLevel(1);
-        d.setSkipChangeLog(true);
 
         submit(createWebClient().goTo("configure").getFormByName("config"));
         assertEquals(1, d.getCompressionLevel());
-        assertEquals(true, d.isSkipChangeLog());
     }
 
     private void roundtrip(final FreeStyleProject p) throws Exception {