-
Notifications
You must be signed in to change notification settings - Fork 1.1k
JENKINS-46081: Add MessageExclusion trait #727
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
chriskilding
wants to merge
6
commits into
jenkinsci:master
Choose a base branch
from
chriskilding:feature/message-exclusion-trait
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7171d1e
Feature: Add MessageExclusion trait
844ad45
Update tests
9ea1c3a
Merge branch 'master' into feature/message-exclusion-trait
MarkEWaite 556a5b9
Fix prior merge error
MarkEWaite 208c9b1
Another fix to my merge error
MarkEWaite 3d6173d
Fix compile error
MarkEWaite File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
src/main/java/jenkins/plugins/git/traits/MessageExclusionTrait.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package jenkins.plugins.git.traits; | ||
|
||
import org.kohsuke.stapler.DataBoundConstructor; | ||
|
||
import hudson.Extension; | ||
import hudson.plugins.git.extensions.impl.MessageExclusion; | ||
|
||
public class MessageExclusionTrait extends GitSCMExtensionTrait<MessageExclusion> { | ||
/** | ||
* Stapler constructor. | ||
* | ||
* @param extension the {@link MessageExclusion}. | ||
*/ | ||
@DataBoundConstructor | ||
public MessageExclusionTrait(MessageExclusion extension) { | ||
super(extension); | ||
} | ||
|
||
/** | ||
* Our {@link hudson.model.Descriptor} | ||
*/ | ||
@Extension | ||
public static class DescriptorImpl extends GitSCMExtensionTraitDescriptor { | ||
/** | ||
* {@inheritDoc} | ||
*/ | ||
@Override | ||
public String getDisplayName() { | ||
return "Message exclusion"; | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ | |
import hudson.plugins.git.extensions.impl.CloneOption; | ||
import hudson.plugins.git.extensions.impl.GitLFSPull; | ||
import hudson.plugins.git.extensions.impl.LocalBranch; | ||
import hudson.plugins.git.extensions.impl.MessageExclusion; | ||
import hudson.plugins.git.extensions.impl.PruneStaleBranch; | ||
import hudson.plugins.git.extensions.impl.SparseCheckoutPaths; | ||
import hudson.plugins.git.extensions.impl.SubmoduleOption; | ||
|
@@ -28,6 +29,7 @@ | |
import jenkins.plugins.git.traits.GitLFSPullTrait; | ||
import jenkins.plugins.git.traits.IgnoreOnPushNotificationTrait; | ||
import jenkins.plugins.git.traits.LocalBranchTrait; | ||
import jenkins.plugins.git.traits.MessageExclusionTrait; | ||
import jenkins.plugins.git.traits.PruneStaleBranchTrait; | ||
import jenkins.plugins.git.traits.RefSpecsSCMSourceTrait; | ||
import jenkins.plugins.git.traits.RemoteNameSCMSourceTrait; | ||
|
@@ -188,6 +190,14 @@ public void pimpped_out() throws Exception { | |
hasProperty("localBranch", is("**")) | ||
) | ||
), | ||
Matchers.<SCMSourceTrait>instanceOf(CleanAfterCheckoutTrait.class), | ||
Matchers.<SCMSourceTrait>instanceOf(CleanBeforeCheckoutTrait.class), | ||
Matchers.allOf( | ||
instanceOf(MessageExclusionTrait.class), | ||
hasProperty("extension", | ||
hasProperty("excludedMessage", is("does not work"))) | ||
) | ||
MarkEWaite marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
), | ||
Matchers.<SCMSourceTrait>allOf( | ||
instanceOf(CleanBeforeCheckoutTrait.class), | ||
hasProperty("extension", | ||
|
@@ -272,6 +282,10 @@ public void pimpped_out() throws Exception { | |
hasProperty("name", is("bob")), | ||
hasProperty("email", is("[email protected]")) | ||
), | ||
Matchers.allOf( | ||
instanceOf(MessageExclusion.class), | ||
hasProperty("excludedMessage", is("does not work")) | ||
), | ||
Matchers.<GitSCMExtension>instanceOf(GitLFSPull.class), | ||
Matchers.<GitSCMExtension>instanceOf(PruneStaleBranch.class), | ||
Matchers.<GitSCMExtension>instanceOf(AuthorInChangelog.class), | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,8 @@ unclassified: | |
- userIdentity: | ||
email: "[email protected]" | ||
name: "custom user" | ||
- messageExclusion: | ||
excludedMessage: "does not work" | ||
- preBuildMerge: | ||
options: | ||
mergeRemote: "myrepo" | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.