Skip to content
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

222: Implement backport issue creation #346

Closed
wants to merge 3 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Jan 10, 2020

Hi all,

Please review this initial implementation of updating the fixVersion of issues (possibly creating a backport issue) when they are resolved by a commit, following the existing rules of the current hg updater.

Best regards,
Robin

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

SKARA-222: Implement backport issue creation

Approvers

  • Erik Helin (ehelin - Reviewer)

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 10, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 10, 2020

Webrevs

Copy link
Member

@edvbld edvbld left a comment

Very nice work Robin 👏 Just a few minor comments and suggestions.

}

/**
* Return True if fixVersionList is empty or contains only scratch values.
Copy link
Member

@edvbld edvbld Jan 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Return True if fixVersionList is empty or contains only scratch values.
* Return true if fixVersionList is empty or contains only scratch values.

}

/**
* Return True if the issue's fixVersionList is a match for fixVersion, using "-pool" or "-open".
Copy link
Member

@edvbld edvbld Jan 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Return True if the issue's fixVersionList is a match for fixVersion, using "-pool" or "-open".
* Return true if the issue's fixVersionList is a match for fixVersion, using "-pool" or "-open".

}

/**
* Return issue or one of its backports that applies to fixver.
Copy link
Member

@edvbld edvbld Jan 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Return issue or one of its backports that applies to fixver.
* Return issue or one of its backports that applies to fixVersion.

* If the main issue has the correct fixVersion, use it.
* If an existing Backport has the correct fixVersion, use it.
* If the main issue has a matching <N>-pool fixVersion, use it.
* If an existing Backport has a matching <N>-pool fixVersion, use it.
Copy link
Member

@edvbld edvbld Jan 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps add:

        * If the main issue       has a matching <N>-open fixVersion, use it.
        * If an existing Backport has a matching <N>-open fixVersion, use it.

if (requestedVersion != null) {
for (var oldVersion : issue.fixVersions()) {
Copy link
Member

@edvbld edvbld Jan 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps add a comment that the old fix versions can only "scratch" versions?

edvbld
edvbld approved these changes Jan 13, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk openjdk bot removed the rfr label Jan 13, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 13, 2020

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

222: Implement backport issue creation

Reviewed-by: ehelin
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 3 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to do this manually, please merge master into your branch first.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jan 13, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Jan 13, 2020

/integrate

@openjdk openjdk bot closed this Jan 13, 2020
@openjdk openjdk bot added integrated and removed ready labels Jan 13, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jan 13, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • af856f5: 216: git-pr: show response to test and integrate commands
  • 3c8b6bc: 215: Verify webrev links before considering publication successful

Your commit was automatically rebased without conflicts.

Pushed as commit 7d878e7.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 13, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 7d878e7
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-01-13 14:16:12 +0000
URL: https://git.openjdk.java.net/skara/commit/7d878e7d

222: Implement backport issue creation

Reviewed-by: ehelin

! bots/notify/src/main/java/org/openjdk/skara/bots/notify/IssueUpdater.java
! bots/notify/src/test/java/org/openjdk/skara/bots/notify/UpdaterTests.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SolvesTests.java
! bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryPullRequest.java
! forge/src/main/java/org/openjdk/skara/forge/github/GitHubPullRequest.java
! forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabMergeRequest.java
! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Issue.java
+ issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueLinkBuilder.java
! issuetracker/src/main/java/org/openjdk/skara/issuetracker/IssueProject.java
! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Link.java
- issuetracker/src/main/java/org/openjdk/skara/issuetracker/LinkBuilder.java
+ issuetracker/src/main/java/org/openjdk/skara/issuetracker/WebLinkBuilder.java
! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraIssue.java
+ issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraLinkType.java
! issuetracker/src/main/java/org/openjdk/skara/issuetracker/jira/JiraProject.java
! issuetracker/src/test/java/org/openjdk/skara/issuetracker/IssueTrackerTests.java
! test/src/main/java/org/openjdk/skara/test/HostCredentials.java
! test/src/main/java/org/openjdk/skara/test/IssueData.java
! test/src/main/java/org/openjdk/skara/test/TestHost.java
! test/src/main/java/org/openjdk/skara/test/TestIssue.java
! test/src/main/java/org/openjdk/skara/test/TestIssueProject.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants