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

Ensure Python 3 compatibility for the hg extension #267

Closed
wants to merge 4 commits into from

Conversation

@rwestberg
Copy link
Member

rwestberg commented Nov 24, 2019

Hi all,

Please review this change that makes Skara's internally used Mercurial extension work with Python 3, while also retaining Python 2 compatibility. The Mercurial distribution on MacOS (through homebrew) recently switched to using Python 3, so this change will make the CI for Mac pass again.

Best regards,
Robin

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Approvers

  • Erik Helin (ehelin - Reviewer)
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 24, 2019

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

rwestberg added 2 commits Nov 25, 2019
@rwestberg rwestberg marked this pull request as ready for review Nov 25, 2019
@rwestberg rwestberg changed the title Python 3 compatibility for the hg extension Ensure Python 3 compatibility for the hg extension Nov 25, 2019
@openjdk openjdk bot added the rfr label Nov 25, 2019
@mlbridge
Copy link

mlbridge bot commented Nov 25, 2019

Webrevs

@edvbld
Copy link
Member

edvbld commented Nov 25, 2019

Robin what kind of testing have you done on this change? Could you please try to do a fresh conversion of one the smaller repositories, like jtreg, to ensure that we haven't broken anything? The unit tests exercise the Mercurial extension quite a bit, but I really want to ensure we don't mess anything up with regards to the hg -> git conversion.

@rwestberg
Copy link
Member Author

rwestberg commented Nov 25, 2019

🐣 The jtreg repository is actually partially converted in the hgbridge tests, but yes, it makes sense to do something a little more extensive.. I'll kick off a few bigger conversions.

@rwestberg
Copy link
Member Author

rwestberg commented Nov 26, 2019

Converted the jdk and panama repositories, and they ended up with the same commit hashes, so I think it's looking good. This was using using Mercurial with Python 2, but we can probably keep using that for the conversions.

@edvbld
Copy link
Member

edvbld commented Nov 26, 2019

Ok, great! Yeah, I agree we can keep using Mercurial with Python 2 for the conversion.

@edvbld
edvbld approved these changes Nov 26, 2019
Copy link
Member

edvbld left a comment

Looks good!

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

openjdk bot commented Nov 26, 2019

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

Ensure Python 3 compatibility for the hg extension

Reviewed-by: ehelin
  • 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 4 commits pushed to the master branch:

  • 0742126: Implement setTitle for GitLab merge requests
  • 6ef6468: 169: If there are no changes after squashing, jcheck should fail
  • bdaf913: 170: Implement setTitle for GitHub pull requests
  • 943987f: 166: Update PR status in body with multiple issues if needed

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.

  • To integrate this PR with the above commit message, type /integrate in a new comment.
@openjdk openjdk bot added the ready label Nov 26, 2019
@rwestberg
Copy link
Member Author

rwestberg commented Nov 26, 2019

/integrate

@openjdk openjdk bot closed this Nov 26, 2019
@openjdk openjdk bot added integrated and removed ready labels Nov 26, 2019
@openjdk
Copy link

openjdk bot commented Nov 26, 2019

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

  • 0742126: Implement setTitle for GitLab merge requests
  • 6ef6468: 169: If there are no changes after squashing, jcheck should fail
  • bdaf913: 170: Implement setTitle for GitHub pull requests
  • 943987f: 166: Update PR status in body with multiple issues if needed

Your commit was automatically rebased without conflicts.

Pushed as commit 59405b7.

@mlbridge
Copy link

mlbridge bot commented Nov 26, 2019

Mailing list message from Robin Westberg on skara-dev:

Changeset: 59405b7
Author: Robin Westberg
Date: 2019-11-26 08:45:48 +0000
URL: https://git.openjdk.java.net/skara/commit/59405b73

Ensure Python 3 compatibility for the hg extension

Reviewed-by: ehelin

! vcs/src/main/resources/ext.py

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

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