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

8269760: idea.sh should not invoke cygpath directly #4655

Closed
wants to merge 2 commits into from

Conversation

@JornVernee
Copy link
Member

@JornVernee JornVernee commented Jul 1, 2021

From the JBS issue:

Currently idea.sh checks if CYGPATH is set, and then continues by invoking cygpath directly.

This doesn't work if CYGPATH is not actually set to cygpath, but to something else, such as wslpath.

Instead of invoking cygpath directly, the value of the CYGPATH variable should be used.


Progress

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

Issue

  • JDK-8269760: idea.sh should not invoke cygpath directly

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4655

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 1, 2021

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

Loading

@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Jul 1, 2021

/cc build
/cc ide-support

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@JornVernee
The build label was successfully added.

Loading

@openjdk openjdk bot added the ide-support label Jul 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@JornVernee
The ide-support label was successfully added.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 1, 2021

Webrevs

Loading

@JornVernee JornVernee changed the base branch from pr/4654 to master Jul 1, 2021
@JornVernee JornVernee changed the base branch from master to pr/4654 Jul 1, 2021
Copy link
Contributor

@mcimadamore mcimadamore left a comment

Not an expert on the value of these variables, but the changes you have look consistent.

Loading

@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Jul 1, 2021

Not an expert on the value of these variables

My own line of thought is that it is reasonable to expect that anything found in the CYGPATH variable is fine to treat as if it were cygpath like this (this could be an alternative cygpath binary, or a substitutable implementation like wslpath)

Loading

erikj79
erikj79 approved these changes Jul 2, 2021
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/4654 to master Jul 5, 2021
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Jul 5, 2021

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 Idea_Conf
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 5, 2021

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

8269760: idea.sh should not invoke cygpath directly

Reviewed-by: mcimadamore, 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 37 new commits pushed to the master branch:

  • 7319896: 8269758: idea.sh doesn't work when there are multiple configurations available.
  • 164eff8: 8263389: IGV: Zooming changes the point that is currently centered
  • 371d996: 8269700: source level for IntelliJ JDK project is set incorrectly
  • 8a7b380: 8269124: Update java.time to use switch expressions (part II)
  • 675a952: 8269821: Remove is-queue-active check in inner loop of write_ref_array_pre_work
  • 4da52ea: 8269004: Implement ResizableResourceHashtable
  • 390d102: 8269652: Factor out the common code for creating system j.l.Thread objects
  • 17f53f2: Merge
  • 1c18f91: 8269768: JFR Terminology Refresh
  • 6f0e8e7: 8269775: compiler/codegen/ClearArrayTest.java failed with "assert(false) failed: bad AD file"
  • ... and 27 more: https://git.openjdk.java.net/jdk/compare/82bfc5d45c54fb37dc021bc91fa17efe34f77f44...master

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.

Loading

@openjdk openjdk bot added the ready label Jul 5, 2021
@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Jul 5, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 5, 2021

Going to push as commit 76783cd.
Since your change was applied there have been 37 commits pushed to the master branch:

  • 7319896: 8269758: idea.sh doesn't work when there are multiple configurations available.
  • 164eff8: 8263389: IGV: Zooming changes the point that is currently centered
  • 371d996: 8269700: source level for IntelliJ JDK project is set incorrectly
  • 8a7b380: 8269124: Update java.time to use switch expressions (part II)
  • 675a952: 8269821: Remove is-queue-active check in inner loop of write_ref_array_pre_work
  • 4da52ea: 8269004: Implement ResizableResourceHashtable
  • 390d102: 8269652: Factor out the common code for creating system j.l.Thread objects
  • 17f53f2: Merge
  • 1c18f91: 8269768: JFR Terminology Refresh
  • 6f0e8e7: 8269775: compiler/codegen/ClearArrayTest.java failed with "assert(false) failed: bad AD file"
  • ... and 27 more: https://git.openjdk.java.net/jdk/compare/82bfc5d45c54fb37dc021bc91fa17efe34f77f44...master

Your commit was automatically rebased without conflicts.

Loading

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

@openjdk openjdk bot commented Jul 5, 2021

@JornVernee Pushed as commit 76783cd.

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

Loading

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