-
New Feature
-
Resolution: Fixed
-
Minor
-
None
Acceptance criteria
- Change requests as implemented in the SCM API expose to consumer code
- the merge strategy
- the origin
- the origin branch name
- In order to retain binary compatibility, some of this information may only be available / correct when the corresponding SCM API implementation plugin has been updated.
- The Branch API plugin has been updated with tests of any new significant code paths relating to branch discovery
- The Branch API plugin exposes the origin and origin branch name when such information is provided by the corresponding SCM API implementation plugin.
- The GitHub Branch Source plugin has been updated to expose the new change request information.
- Upgrading from the 2.x.y series of the GitHub Branch Source shall not trigger a rebuild storm.
- Upgrading from the 1.x series of the GitHub Branch Source should make best effort not to trigger a rebuild storm.
- The Bitbucket Branch Source plugin has been updated to expose the new change request information
- Upgrading from the 2.x.y series of the Bitbucket Branch Source shall not trigger a rebuild storm.
- Upgrading from the 1.x series of the Bitbucket Branch Source should make best effort not to trigger a rebuild storm.
- The SCM API's implementer guide has been updated to reflect the new recommendations for implementing change requests.
[JENKINS-43433] Allow SCMSource implementations to expose merge and origin of change request heads
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMHead.java
http://jenkins-ci.org/commit/github-branch-source-plugin/195fff0f188d0601e04fde64cfc610f50cfdeaca
Log:
JENKINS-43433 Update to latest -SNAPSHOT
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
http://jenkins-ci.org/commit/github-branch-source-plugin/95ceec008f380527b436f332ca379593fc11f3f0
Log:
JENKINS-43433 Pick up SCM API -SNAPSHOT
Compare: https://github.com/jenkinsci/github-branch-source-plugin/compare/565357544748^...95ceec008f38
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMRevision.java
src/main/java/jenkins/scm/api/mixin/DistributedChangeRequestSCMHead.java
src/main/java/jenkins/scm/api/mixin/MergeableChangeRequestSCMHead.java
http://jenkins-ci.org/commit/scm-api-plugin/b832ca973241dbae5d8b7021ee86293b8c710c02
Log:
JENKINS-43433 Allow SCMSource implementations to expose merge and origin of change request heads
Code changed in jenkins
User: Stephen Connolly
Path:
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMRevision.java
http://jenkins-ci.org/commit/scm-api-plugin/af9db3dbbca22a920bcf9e05edafb1ab2da5deaa
Log:
JENKINS-43433 Remove left-over parameter
Code changed in jenkins
User: Stephen Connolly
Path:
docs/implementation.adoc
pom.xml
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMRevision.java
src/main/java/jenkins/scm/api/mixin/DistributedChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestFlags.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestSCMRevision.java
src/test/java/jenkins/scm/impl/mock/MockDistributedChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockDistributedMergeableChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockMergeableChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockRepositoryFlags.java
src/test/java/jenkins/scm/impl/mock/MockSCM.java
src/test/java/jenkins/scm/impl/mock/MockSCMController.java
src/test/java/jenkins/scm/impl/mock/MockSCMSource.java
http://jenkins-ci.org/commit/scm-api-plugin/279fb33ab6f37a9a373067b104df3399683aee2e
Log:
JENKINS-43433 Update docs, mocks and fix a bug or two
- bug fixes come thanks to additional tests in branch-api
Code changed in jenkins
User: Stephen Connolly
Path:
src/main/java/jenkins/scm/api/SCMHead.java
src/main/java/jenkins/scm/api/SCMHeadOrigin.java
src/main/java/jenkins/scm/api/mixin/ChangeRequestCheckoutStrategy.java
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMHead2.java
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMRevision.java
src/main/java/jenkins/scm/api/mixin/DistributedChangeRequestSCMHead.java
src/main/java/jenkins/scm/api/mixin/MergeableChangeRequestSCMHead.java
src/main/java/jenkins/scm/api/mixin/SCMHeadMixin.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockDistributedChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockDistributedMergeableChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockMergeableChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockRepositoryFlags.java
src/test/java/jenkins/scm/impl/mock/MockSCM.java
src/test/java/jenkins/scm/impl/mock/MockSCMSource.java
src/test/resources/jenkins/scm/impl/mock/MockSCMSource/config-detail.jelly
http://jenkins-ci.org/commit/scm-api-plugin/bdd5375953cd31873e837529c3d474ae7fd0645e
Log:
JENKINS-43433] Refactor to better names
Code changed in jenkins
User: Stephen Connolly
Path:
docs/implementation.adoc
http://jenkins-ci.org/commit/scm-api-plugin/882e15afaf7031a3748e95b8e25a75382b1302e6
Log:
JENKINS-43433 Update docs
Code changed in jenkins
User: Stephen Connolly
Path:
docs/implementation.adoc
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMHead2.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestSCMHead.java
http://jenkins-ci.org/commit/scm-api-plugin/faf4bb6a626403c647ea18c61ab793550be2d219
Log:
JENKINS-43433 Expose the origin branch name also while we are at it
Code changed in jenkins
User: Stephen Connolly
Path:
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMHead2.java
http://jenkins-ci.org/commit/scm-api-plugin/1c828018f93739eff14bdac467549d3c3ecf0c7a
Log:
JENKINS-43433 Missed NonNull annotation
Code changed in jenkins
User: Stephen Connolly
Path:
src/main/java/jenkins/scm/api/mixin/ChangeRequestCheckoutStrategy.java
http://jenkins-ci.org/commit/scm-api-plugin/e22f04a18a351e68599d53cb726c9f5811255360
Log:
JENKINS-43433 No need to differentiate between MERGE and REBASE
Code changed in jenkins
User: Stephen Connolly
Path:
src/main/java/jenkins/scm/api/SCMHeadOrigin.java
http://jenkins-ci.org/commit/scm-api-plugin/7863fb6da4ae5f6c62077876db394f3a46b5f111
Log:
JENKINS-43433 Clarify what are good names
Code changed in jenkins
User: Stephen Connolly
Path:
docs/implementation.adoc
pom.xml
src/main/java/jenkins/scm/api/SCMHead.java
src/main/java/jenkins/scm/api/SCMHeadOrigin.java
src/main/java/jenkins/scm/api/mixin/ChangeRequestCheckoutStrategy.java
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMHead2.java
src/main/java/jenkins/scm/api/mixin/ChangeRequestSCMRevision.java
src/main/java/jenkins/scm/api/mixin/SCMHeadMixin.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestFlags.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestSCMHead.java
src/test/java/jenkins/scm/impl/mock/MockChangeRequestSCMRevision.java
src/test/java/jenkins/scm/impl/mock/MockRepositoryFlags.java
src/test/java/jenkins/scm/impl/mock/MockSCM.java
src/test/java/jenkins/scm/impl/mock/MockSCMController.java
src/test/java/jenkins/scm/impl/mock/MockSCMSource.java
src/test/resources/jenkins/scm/impl/mock/MockSCMSource/config-detail.jelly
http://jenkins-ci.org/commit/scm-api-plugin/5fe2558cad4e052267c6a2826602ca2910afb32d
Log:
Merge pull request #35 from stephenc/jenkins-43433
JENKINS-43433 Allow SCMSource implementations to expose merge and origin of change request heads
Compare: https://github.com/jenkinsci/scm-api-plugin/compare/5631932f5cdf...5fe2558cad4e
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/test/java/integration/EventsTest.java
http://jenkins-ci.org/commit/branch-api-plugin/a4d62a858b5925e38d4a965ce82b9f711e7130ec
Log:
JENKINS-43433 Add more tests now that we can do merge PRs
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/test/java/integration/EventsTest.java
http://jenkins-ci.org/commit/branch-api-plugin/fd2799dc5af738c2646a99e99e4a333065258d52
Log:
JENKINS-43433 Pick up SCM API refactoring
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/main/java/jenkins/branch/BranchNameContributor.java
http://jenkins-ci.org/commit/branch-api-plugin/6c5953a1bcc0cb900d53022f7916a2a14e76c81c
Log:
JENKINS-43433 Update to latest -SNAPSHOT
Code changed in jenkins
User: Stephen Connolly
Path:
src/test/java/jenkins/branch/BranchNameContributorTest.java
http://jenkins-ci.org/commit/branch-api-plugin/3300e7022c2aaedcca32b9d78fae7fad1cdd69b6
Log:
JENKINS-43433 Add a test for BranchNameContributor
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/test/java/integration/EventsTest.java
http://jenkins-ci.org/commit/branch-api-plugin/809ea046b98d070bc0d1004b95ddf3c37fda0c9f
Log:
JENKINS-43433 No need to differentiate between MERGE and REBASE
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMHead.java
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevision.java
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSource.java
src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTest.java
http://jenkins-ci.org/commit/github-branch-source-plugin/d8fc1a8b42495a918576f6688442744fa1c4d6e5
Log:
JENKINS-43433 Adapt to new API
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMHead.java
http://jenkins-ci.org/commit/github-branch-source-plugin/8125cbf0c60b859015654bddf7d4a051380ff301
Log:
JENKINS-43433 Update to latest -SNAPSHOT
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
http://jenkins-ci.org/commit/github-branch-source-plugin/f695f9f2a1682f7cd597ca716fc5b4ca0e914969
Log:
JENKINS-43433 Pick up SCM API -SNAPSHOT
Code changed in jenkins
User: Stephen Connolly
Path:
pom.xml
src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMHead.java
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevision.java
src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSource.java
src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTest.java
http://jenkins-ci.org/commit/github-branch-source-plugin/5653575447484d78a5a04a9100ba87ca35d789f0
Log:
JENKINS-43433Adapt to new API