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

8323241: jcmd manpage should use lists for argument lists #17318

Closed
wants to merge 1 commit into from

Conversation

dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Jan 9, 2024

Trivial fix to the formatting of "argument" lists for a few sub-commands.
Thanks


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8323241: jcmd manpage should use lists for argument lists (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17318/head:pull/17318
$ git checkout pull/17318

Update a local copy of the PR:
$ git checkout pull/17318
$ git pull https://git.openjdk.org/jdk.git pull/17318/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17318

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17318.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2024

👋 Welcome back dholmes! 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 added the rfr Pull request is ready for review label Jan 9, 2024
@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@dholmes-ora The following label will be automatically applied to this pull request:

  • serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the serviceability serviceability-dev@openjdk.org label Jan 9, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@dholmes-ora 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:

8323241: jcmd manpage should use lists for argument lists

Reviewed-by: alanb

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 6 new commits pushed to the master branch:

  • 30f93a2: 8320069: RISC-V: Add Zcb instructions
  • 4cf131a: 8319716: RISC-V: Add SHA-2
  • 7286f52: 8322829: Refactor nioBlocker to avoid blocking while holding Thread's interrupt lock
  • 07fce8e: 8320864: Serial: Extract out Full GC related fields from ContiguousSpace
  • 176606d: 8310995: missing @SInCE tags in 36 jdk.dynalink classes
  • 8ae309e: 8318971: Better Error Handling for Jar Tool When Processing Non-existent Files

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 Pull request is ready to be integrated label Jan 9, 2024
@dholmes-ora
Copy link
Member Author

Thanks for the review @AlanBateman !

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

Going to push as commit 075fed9.
Since your change was applied there have been 6 commits pushed to the master branch:

  • 30f93a2: 8320069: RISC-V: Add Zcb instructions
  • 4cf131a: 8319716: RISC-V: Add SHA-2
  • 7286f52: 8322829: Refactor nioBlocker to avoid blocking while holding Thread's interrupt lock
  • 07fce8e: 8320864: Serial: Extract out Full GC related fields from ContiguousSpace
  • 176606d: 8310995: missing @SInCE tags in 36 jdk.dynalink classes
  • 8ae309e: 8318971: Better Error Handling for Jar Tool When Processing Non-existent Files

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 9, 2024

@dholmes-ora Pushed as commit 075fed9.

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

@dholmes-ora dholmes-ora deleted the 8323241-jcmd-manpage branch January 9, 2024 08:22
@dholmes-ora
Copy link
Member Author

/backport jdk22

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@dholmes-ora Could not automatically backport 075fed91 to openjdk/jdk22 due to conflicts in the following files:

  • src/jdk.jcmd/share/man/jcmd.1

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk22. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk22.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-dholmes-ora-075fed91

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 075fed91bd144d94328e198b41ea2946961940e9

# Backport the commit
$ git cherry-pick --no-commit 075fed91bd144d94328e198b41ea2946961940e9
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 075fed91bd144d94328e198b41ea2946961940e9'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk22 with the title Backport 075fed91bd144d94328e198b41ea2946961940e9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
2 participants