[JENKINS-4162] Optionally report the most recent commit as the changelog of a new build

src/main/java/hudson/plugins/git/GitSCM.java

@@ -28,6 +28,7 @@
 import hudson.plugins.git.extensions.impl.BuildSingleRevisionOnly;
 import hudson.plugins.git.extensions.impl.ChangelogToBranch;
 import hudson.plugins.git.extensions.impl.CloneOption;
+import hudson.plugins.git.extensions.impl.FirstBuildChangelog;
 import hudson.plugins.git.extensions.impl.PathRestriction;
 import hudson.plugins.git.extensions.impl.LocalBranch;
 import hudson.plugins.git.extensions.impl.RelativeTargetDirectory;
@@ -1493,9 +1494,18 @@
             }
 
             if (!exclusion) {
-                // this is the first time we are building this branch, so there's no base line to compare against.
-                // if we force the changelog, it'll contain all the changes in the repo, which is not what we want.
-                listener.getLogger().println("First time build. Skipping changelog.");
+                FirstBuildChangelog firstBuildChangelog = getExtensions().get(FirstBuildChangelog.class);
+                if (firstBuildChangelog!=null&&firstBuildChangelog.isMakeChangelog()) {
+                    changelog.to(out).max(1).execute();
+                    executed = true;
+                    listener.getLogger().println("First time build. Latest changes added to changelog.");
+                } else {
+                    // this is the first time we are building this branch, so there's no base line
+                    // to compare against.
+                    // if we force the changelog, it'll contain all the changes in the repo, which
+                    // is not what we want.
+                    listener.getLogger().println("First time build. Skipping changelog.");
+                }
             } else {
                 changelog.to(out).max(MAX_CHANGELOG).execute();
                 executed = true;

src/main/java/hudson/plugins/git/extensions/impl/FirstBuildChangelog.java

@@ -0,0 +1,78 @@
+package hudson.plugins.git.extensions.impl;
+
+import hudson.Extension;
+import hudson.plugins.git.extensions.GitSCMExtension;
+import hudson.plugins.git.extensions.GitSCMExtensionDescriptor;
+import java.util.Objects;
+
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
+
+/**
+ * First Build generates a changelog.
+ *
+ * @author Derek Inskeep
+ */
+public class FirstBuildChangelog extends GitSCMExtension {
+    private boolean makeChangelog;
+
+    @DataBoundConstructor
+    public FirstBuildChangelog() {
+    }
+
+    public boolean isMakeChangelog() {
+        return makeChangelog;
+    }
+
+    @DataBoundSetter
+    public void setMakeChangelog(boolean makeChangelog) {
+        this.makeChangelog = makeChangelog;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        FirstBuildChangelog that = (FirstBuildChangelog) o;
+        return makeChangelog == that.makeChangelog;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int hashCode() {
+        return Objects.hash(makeChangelog);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString() {
+        return "FirstBuildChangelog{" +
+                "makeChangelog=" + makeChangelog +
+                '}';
+    }
+
+    @Extension
+    @Symbol("FirstBuildChangelog")
+    public static class DescriptorImpl extends GitSCMExtensionDescriptor {
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public String getDisplayName() {
+            return "First Build Changelog";
+        }
+    }
+}

src/main/java/jenkins/plugins/git/traits/FirstBuildChangelogTrait.java

@@ -0,0 +1,50 @@
+package jenkins.plugins.git.traits;
+
+import hudson.Extension;
+import hudson.plugins.git.extensions.impl.FirstBuildChangelog;
+import jenkins.scm.api.trait.SCMSourceTrait;
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+
+/**
+ * Exposes {@link FirstBuildChangelog} as a {@link SCMSourceTrait}.
+ *
+ * @since 5.2.0
+ */
+public class FirstBuildChangelogTrait extends GitSCMExtensionTrait<FirstBuildChangelog> {
+
+    /**
+     * @deprecated Use constructor that accepts extension instead.
+     */
+    @Deprecated
+    public FirstBuildChangelogTrait() {
+        this(null);
+    }
+
+    /**
+     * Stapler constructor.
+     *
+     * @param extension the option to force first build to have a non-empty changelog.
+     */
+    @DataBoundConstructor
+    public FirstBuildChangelogTrait(@CheckForNull FirstBuildChangelog extension) {
+        super(extension == null ? new FirstBuildChangelog() : extension);
+    }
+
+    /**
+     * Our {@link hudson.model.Descriptor}
+     */
+    @Extension
+    @Symbol("FirstBuildChangelog")
+    public static class DescriptorImpl extends GitSCMExtensionTraitDescriptor {
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public String getDisplayName() {
+            return "First Build Changelog";
+        }
+    }
+}

src/main/resources/hudson/plugins/git/extensions/impl/FirstBuildChangelog/config.groovy

@@ -0,0 +1,7 @@
+package hudson.plugins.git.extensions.impl.FirstBuildChangelog
+
+def f = namespace(lib.FormTagLib)
+
+f.entry(field: "makeChangelog") {
+    f.checkbox(title: _("Make Changelog"))
+}

src/main/resources/hudson/plugins/git/extensions/impl/FirstBuildChangelog/help-makeChangelog.html

@@ -0,0 +1,3 @@
+<div>
+  First builds create changelog of latest commit, if any.
+</div>

src/main/resources/hudson/plugins/git/extensions/impl/FirstBuildChangelog/help.html

@@ -0,0 +1,3 @@
+<div>
+  First builds will populate the changelog with the latest commit, if any, to allow for pipelines to consistently check and test for file changes.
+</div>

src/test/java/hudson/plugins/git/GitSCMTest.java

@@ -1188,6 +1188,26 @@ public void testCleanBeforeCheckout() throws Exception {
         assertThat("Cleaning should happen before fetch", cleaningLogLine, is(lessThan(fetchingLogLine)));
     }
 
+    @Test
+    public void testFirstBuiltChangelog() throws Exception {
+        assumeTrue("Test class max time " + MAX_SECONDS_FOR_THESE_TESTS + " exceeded", isTimeAvailable());
+        FreeStyleProject p = setupProject("master", false, null, null, "Jane Doe", null);
+        FirstBuildChangelog fbc = new FirstBuildChangelog();
+        fbc.setMakeChangelog(true);
+        ((GitSCM) p.getScm()).getExtensions().add(fbc);
+
+        /* First build should should generate a changelog */
+        final String commitFile1 = "commitFile1";
+        commit(commitFile1, johnDoe, janeDoe, "Commit number 1");
+        final FreeStyleBuild firstBuild = build(p, Result.SUCCESS, commitFile1);
+        assertThat(firstBuild.getLog(50), hasItem("First time build. Latest changes added to changelog."));
+        /* Second build should have normal behavior */
+        final String commitFile2 = "commitFile2";
+        commit(commitFile2, johnDoe, janeDoe, "Commit number 2");
+        final FreeStyleBuild secondBuild = build(p, Result.SUCCESS, commitFile2);
+        assertThat(secondBuild.getLog(50), not(hasItem("First time build. Latest changes added to changelog.")));
+    }
+
     @Issue("JENKINS-8342")
     @Test
     public void testExcludedRegionMultiCommit() throws Exception {