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

1051: JCheck complains about issue already used #1178

Closed
wants to merge 3 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented May 28, 2021

The DuplicateIssuesCheck can sometimes report false positives when the same issueId has been used in separate branches. This patch fixes the check so that only commits that are ancestors of the commit being checked are considered.


Progress

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

Issue

  • SKARA-1051: JCheck complains about issue already used

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1178/head:pull/1178
$ git checkout pull/1178

Update a local copy of the PR:
$ git checkout pull/1178
$ git pull https://git.openjdk.java.net/skara pull/1178/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1178

View PR using the GUI difftool:
$ git pr show -t 1178

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1178.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 28, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title SKARA-1051 1051: JCheck complains about issue already used May 28, 2021
@openjdk openjdk bot added the rfr label May 28, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 28, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jun 2, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

1051: JCheck complains about issue already used

Reviewed-by: tbell, kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • f8e97f7: 1056: Mirror service is no longer syncing tags
  • 8998a07: 1065: New prometheus labels have illegal characters
  • 2cc7436: 1031: Declare Skara 1.0

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot added the ready label Jun 2, 2021
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good with one minor suggestion.

log.finer("issue: the JBS issue " + issue.toString() + " has been used in multiple commits");
var uniqueHashes = new ArrayList<>(new HashSet<>(hashes));
issues.add(new DuplicateIssuesIssue(issue, uniqueHashes, metadata));
if (hashes != null) {
Copy link
Member

@kevinrushforth kevinrushforth Jun 2, 2021

Choose a reason for hiding this comment

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

You can save the additional processing if hashes.size() is 1, so I recommend leaving this test as it was before:

if (hashes != null && hashes.size() > 1) {

Copy link
Member Author

@erikj79 erikj79 Jun 2, 2021

Choose a reason for hiding this comment

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

Good point.

@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Jun 2, 2021

/integrate

@openjdk openjdk bot closed this Jun 2, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 2, 2021

@erikj79 Since your change was applied there have been 3 commits pushed to the master branch:

  • f8e97f7: 1056: Mirror service is no longer syncing tags
  • 8998a07: 1065: New prometheus labels have illegal characters
  • 2cc7436: 1031: Declare Skara 1.0

Your commit was automatically rebased without conflicts.

Pushed as commit bce5f6f.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

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