Skip to content

Conversation

@magicus
Copy link
Member

@magicus magicus commented Aug 29, 2024

The indentation in the build system should be two spaces for logical indents, and four spaces for broken lines, period.

I searched for files starting with an odd number of spaces, and fixed those.


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-8339235: Fix indentation in build system (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20763

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 29, 2024

👋 Welcome back ihse! 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
Copy link

openjdk bot commented Aug 29, 2024

@magicus 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:

8339235: Fix indentation in build system

Reviewed-by: erikj

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

  • 777ed2b: 8339132: Make DirectCodeBuilder write through without allocating instruction objects
  • e57b593: 8335062: NMT: Make StackIndex non-opaque
  • 8c8b580: 8338281: jshell does not run shutdown hooks
  • d35ffa4: 8339017: Make a couple of fields in DoubleByte static
  • 723588a: 8338569: HTTP/1.1 CleanupTrigger may be triggerred after the next exchange started

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
Copy link

openjdk bot commented Aug 29, 2024

@magicus this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout fix-bad-indentation
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review labels Aug 29, 2024
@openjdk
Copy link

openjdk bot commented Aug 29, 2024

@magicus The following labels will be automatically applied to this pull request:

  • build
  • client

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

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Aug 29, 2024
@magicus
Copy link
Member Author

magicus commented Aug 29, 2024

/label -client

@openjdk openjdk bot removed merge-conflict Pull request has merge conflict with target branch client client-libs-dev@openjdk.org labels Aug 29, 2024
@openjdk
Copy link

openjdk bot commented Aug 29, 2024

@magicus
The client label was successfully removed.

@mlbridge
Copy link

mlbridge bot commented Aug 29, 2024

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this! See two nits. Also for anyone wondering, we defined these conventions for the build system a long time ago: https://openjdk.org/groups/build/doc/code-conventions.html

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 29, 2024
@magicus
Copy link
Member Author

magicus commented Aug 30, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Aug 30, 2024

Going to push as commit 2abe2ff.
Since your change was applied there have been 13 commits pushed to the master branch:

  • bb28b0d: 8338404: Cross-compilation to different endianness fails after JDK-8318913
  • b872718: 8338301: Error recovery and reporting should be improved for erroneous implicitly declared classes
  • b9e65f9: 8337662: Improve os::print_hex_dump for printing Instructions sections
  • f927c12: 8339154: Cleanups and JUnit conversion of test/jdk/java/util/zip/Available.java
  • 4675913: 8339237: RISC-V: Builds fail after JDK-8339120
  • b711c41: 8339196: Optimize BufWriterImpl#writeU1/U2/Int/Long
  • f2968b3: 8339020: Remove unused HeapShared::calculate_oopmap
  • a4962ac: 8338257: UTF8 lengths should be size_t not int
  • 777ed2b: 8339132: Make DirectCodeBuilder write through without allocating instruction objects
  • e57b593: 8335062: NMT: Make StackIndex non-opaque
  • ... and 3 more: https://git.openjdk.org/jdk/compare/362f9ce077baa900ed81a0473ec0187efde132ef...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 30, 2024

@magicus Pushed as commit 2abe2ff.

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

@magicus magicus deleted the fix-bad-indentation branch August 30, 2024 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants