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

Make ext.py compatible with hg5 api #67

Closed
wants to merge 3 commits into from

Conversation

JornVernee
Copy link
Member

@JornVernee JornVernee commented Aug 22, 2019

The HG api changes in version 5 to drop the first 2 parameters to mercurial.match.exact, which breaks the extension script.

This PR detects whether we're running on hg 5, and if so, calls the function without the first 2 arguments instead.

Progress

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

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 22, 2019

👋 Welcome back jvernee! 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).

@openjdk openjdk bot added the rfr label Aug 22, 2019
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 22, 2019

Webrevs

vcs/src/main/resources/ext.py Outdated Show resolved Hide resolved
edvbld
edvbld approved these changes Aug 22, 2019
Copy link
Member

@edvbld edvbld left a comment

Looks good, this is ready to go. I successfully run all tests on Linux x86_64 using sh gradlew test and Mercurial 4.9.0

@openjdk openjdk bot removed the rfr label Aug 22, 2019
@openjdk
Copy link

@openjdk openjdk bot commented Aug 22, 2019

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

Make ext.py compatible with hg5 api

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:

  • 6d6a0b6: A repository without refs but with objects is healthy
  • 69d6b6b: Fix 2 failing tests due to URI syntax errors
  • b4b37e8: Fix some issues building on Windows
  • 1b97234: Convert path separators in patch file to unix explicitly

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 Aug 22, 2019
@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Aug 22, 2019

@edvbld There was one other call to mercurial.match.exact which I forgot to change earlier (but was caught by another test)... changed that as well.

Still good to go?

@edvbld
Copy link
Member

@edvbld edvbld commented Aug 22, 2019

@JornVernee yep, still good!

@JornVernee
Copy link
Member Author

@JornVernee JornVernee commented Aug 22, 2019

/integrate

@openjdk openjdk bot closed this Aug 22, 2019
@openjdk
Copy link

@openjdk openjdk bot commented Aug 22, 2019

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

Your commit was automatically rebased without conflicts.
Pushed as commit 256e498.

@openjdk openjdk bot added the integrated label Aug 22, 2019
@JornVernee JornVernee deleted the ext_fix_hg5 branch Aug 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants