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

8278065: Refactor subclassAudits to use ClassValue #260

Closed
wants to merge 3 commits into from

Conversation

rkennke
Copy link
Contributor

@rkennke rkennke commented Mar 16, 2022

This backports the fix for JDK-8278065, which fixes a number of small issues with the preceding change for JDK-8277072.
The original change has baked for several weeks in jdk19 and applies with some fuzz, but no conflicts.

Testing:

  • tier1
  • tier2
  • tier3

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8278065: Refactor subclassAudits to use ClassValue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/260/head:pull/260
$ git checkout pull/260

Update a local copy of the PR:
$ git checkout pull/260
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/260/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 260

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/260.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2022

👋 Welcome back rkennke! A progress list of the required criteria for merging this PR into pr/210 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 Backport 8fed8ab29cae4f189f44609c23f116967eef6bdf 8278065: Refactor subclassAudits to use ClassValue Mar 16, 2022
@openjdk
Copy link

openjdk bot commented Mar 16, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Mar 16, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 16, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/210 to master March 25, 2022 10:10
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout rkennke-backport-8eb453ba
git fetch https://git.openjdk.java.net/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Mar 25, 2022
@TheRealMDoerr
Copy link
Contributor

Unfortunately, following the instructions suggested by Skara messes up the PR. The diff contains both backports and the clean label is lost. I had the same problems when trying it. (What works is rebase and force-push which is not particularly nice, either.) I don't know what would happen when integrating it this way. Is the best way in this situation to just throw it away and redo it?

@rkennke
Copy link
Contributor Author

rkennke commented Mar 25, 2022

Unfortunately, following the instructions suggested by Skara messes up the PR. The diff contains both backports and the clean label is lost. I had the same problems when trying it. (What works is rebase and force-push which is not particularly nice, either.) I don't know what would happen when integrating it this way. Is the best way in this situation to just throw it away and redo it?

As far as I know, the recommended way is to manually merge from upstream/master, push it to the PR branch, wait until it is flagged with clean label again, and then go. That's what I would do, unless you object to this plan.

@openjdk openjdk bot added the clean label Mar 25, 2022
@openjdk
Copy link

openjdk bot commented Mar 25, 2022

@rkennke 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.

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

8278065: Refactor subclassAudits to use ClassValue

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Pull request is ready to be integrated label Mar 25, 2022
@TheRealMDoerr
Copy link
Contributor

Oh, ok. That's fine. Thanks for the hint.

@rkennke
Copy link
Contributor Author

rkennke commented Mar 25, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 25, 2022

Going to push as commit 8d7f26b.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 25, 2022
@openjdk openjdk bot closed this Mar 25, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 25, 2022
@openjdk
Copy link

openjdk bot commented Mar 25, 2022

@rkennke Pushed as commit 8d7f26b.

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

@rkennke rkennke deleted the backport-JDK-8278065 branch March 25, 2022 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants