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

8234174: Change IDEA VCS mapping to Git #37

Closed

Conversation

@AlexanderScherbatiy
Copy link

AlexanderScherbatiy commented Nov 14, 2019

Allow IDEA to correctly detect Git version control system when opening JFX project.

Progress

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

Issue

JDK-8234174: Change IDEA VCS mapping to Git

Approvers

  • Kevin Rushforth (kcr - Reviewer)
@bridgekeeper bridgekeeper bot added the oca label Nov 14, 2019
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 14, 2019

Hi AlexanderScherbatiy, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user AlexanderScherbatiy" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@kevinrushforth
Copy link
Member

kevinrushforth commented Nov 14, 2019

@AlexanderScherbatiy this is the part that applies to you:

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user AlexanderScherbatiy" as summary for the issue.

Also, please read the contributing guidelines. As with the JDK project, we need a JBS bug ID for every pull request.

@AlexanderScherbatiy AlexanderScherbatiy force-pushed the AlexanderScherbatiy:IDEA-GIT-VCS branch from 12cbd35 to f0f1866 Nov 14, 2019
@AlexanderScherbatiy
Copy link
Author

AlexanderScherbatiy commented Nov 14, 2019

I have created issue JDK-8234174 Change IDEA VCS mapping to Git.

I have created SKARA-161 to map my GitHub username to my OpenJDK username.

@AlexanderScherbatiy AlexanderScherbatiy changed the title Change IDEA VCS mapping to Git 234174: Change IDEA VCS mapping to Git Nov 14, 2019
@bridgekeeper bridgekeeper bot removed the oca label Nov 14, 2019
@AlexanderScherbatiy AlexanderScherbatiy changed the title 234174: Change IDEA VCS mapping to Git 8234174: Change IDEA VCS mapping to Git Nov 14, 2019
@openjdk openjdk bot added the rfr label Nov 14, 2019
@mlbridge
Copy link

mlbridge bot commented Nov 14, 2019

Webrevs

@tsayao
Copy link
Collaborator

tsayao commented Nov 14, 2019

Just one note: Idea can import the project from gradle, so many idea files on the project just gets on the way when committing. Not sure about this file in particular, but I think it would be better to remove IDE specific project files (for IDEs that supports it).

Copy link
Member

kevinrushforth left a comment

Adding to what @tsayao said, there is a JBS issue, JDK-8223373, to remove the .idea files from the repo.

I think this change is fine in the short term even if we end up removing the .idea files in the near future.

</component>
</project>
</project>

This comment has been minimized.

@kevinrushforth

kevinrushforth Nov 14, 2019 Member

Minor: can you restore the newline that was removed? It isn't related to the change, and in general, text files should end with a newline (although that's a suggestion, not a rule).

This comment has been minimized.

@AlexanderScherbatiy
Copy link
Author

AlexanderScherbatiy commented Nov 14, 2019

I use IDEA 2019.2.4.
I tried to remove the .idea directory from jfx project and and open jfx project by IDEA using File -> New -> Project From Existing Sources... and point to jfx/build.gradle file.
It started to analyze the project and just silently stops importing the project without any message in the ~/.IdeaIC2019.2/system/log/idea.log file.

@AlexanderScherbatiy
Copy link
Author

AlexanderScherbatiy commented Nov 14, 2019

Some .idea files are already in .gitignore

# Ignore IntelliJ files
.idea/tasks.xml
.idea/workspace.xml
.idea/inspectionProfiles/**
.idea/copyright/profiles_settings.xml
.idea/codeStyles/**
.idea/checkstyle-idea.xml
Copy link
Member

kevinrushforth left a comment

Looks good. Since this is a trivial, and obviously correct, change to an IDE file, it only needs a single reviewer. You may integrate it when ready; I'll sponsor it.

@openjdk openjdk bot removed the rfr label Nov 14, 2019
@openjdk
Copy link

openjdk bot commented Nov 14, 2019

@AlexanderScherbatiy This change can now be integrated. The commit message will be:

8234174: Change IDEA VCS mapping to Git

Reviewed-by: kcr
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there have been 3 commits pushed to the master branch:

  • 3d0cb49: 8234189: [TEST_BUG] Remove ignored and invalid graphics unit tests
  • dc01309: 8234110: SwingFXUtilsTest is unsuitable for unit test framework
  • 5b96ee4: 8231188: Update SQLite to version 3.30.1

Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge master into your branch first.

As you do not have Committer status in this project, an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@kevinrushforth) but any other Committer may sponsor as well.

  • To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).
@openjdk openjdk bot added the ready label Nov 14, 2019
@AlexanderScherbatiy
Copy link
Author

AlexanderScherbatiy commented Nov 15, 2019

/integrate

@openjdk
Copy link

openjdk bot commented Nov 15, 2019

@AlexanderScherbatiy
Your change (at version c55e4d8) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added the sponsor label Nov 15, 2019
@kevinrushforth
Copy link
Member

kevinrushforth commented Nov 15, 2019

/sponsor

@openjdk openjdk bot closed this Nov 15, 2019
@openjdk openjdk bot added integrated and removed sponsor labels Nov 15, 2019
@openjdk
Copy link

openjdk bot commented Nov 15, 2019

@kevinrushforth @AlexanderScherbatiy The following commits have been pushed to master since your change was applied:

  • 3d0cb49: 8234189: [TEST_BUG] Remove ignored and invalid graphics unit tests
  • dc01309: 8234110: SwingFXUtilsTest is unsuitable for unit test framework
  • 5b96ee4: 8231188: Update SQLite to version 3.30.1

Your commit was automatically rebased without conflicts.

Pushed as commit 927fc8a.

@openjdk openjdk bot removed the ready label Nov 15, 2019
@mlbridge
Copy link

mlbridge bot commented Nov 15, 2019

Mailing list message from Kevin Rushforth on openjfx-dev:

Changeset: 927fc8a
Author: Alexander Scherbatiy
Committer: Kevin Rushforth
Date: 2019-11-15 13:04:12 +0000
URL: https://git.openjdk.java.net/jfx/commit/927fc8a0

8234174: Change IDEA VCS mapping to Git

Reviewed-by: kcr

! .idea/vcs.xml

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

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.