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

Add support for Mercurial #122

Closed
wants to merge 2 commits into from
Closed

Add support for Mercurial #122

wants to merge 2 commits into from

Conversation

@edvbld
Copy link
Member

edvbld commented Sep 9, 2019

Hi all,

this patch adds skara.py which makes it quite a bit more convenient to use the Skara tools from Mercurial (hg). I also added --mercurial to git-pr and git-fork so they can be used with hg-git. There are still a few minor things to work out, for example hg pr create does not work yet and I need to do add some help texts, but it is a start.

Testing

  • Manual testing with git token

Thanks,
Erik

Progress

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

Approvers

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 9, 2019

👋 Welcome back ehelin! 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 rfr cli labels Sep 9, 2019
@mlbridge
Copy link

mlbridge bot commented Sep 9, 2019

Webrevs

Copy link
Member

rwestberg left a comment

Looks good! Only had some minor comments / suggestions.

cli/src/main/java/org/openjdk/skara/cli/GitFork.java Outdated Show resolved Hide resolved
skara.py Show resolved Hide resolved
@openjdk openjdk bot removed the rfr label Sep 9, 2019
@openjdk
Copy link

openjdk bot commented Sep 9, 2019

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

Add support for Mercurial

Reviewed-by: rwestberg
  • 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 has been 1 commit pushed to the master branch:

  • 4a88959: Add tool for importing webrev patches

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 Sep 9, 2019
@edvbld
Copy link
Member Author

edvbld commented Sep 10, 2019

/integrate

@openjdk openjdk bot closed this Sep 10, 2019
@openjdk openjdk bot added integrated and removed ready labels Sep 10, 2019
@openjdk
Copy link

openjdk bot commented Sep 10, 2019

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

Your commit was automatically rebased without conflicts.
Pushed as commit d14976e.

@edvbld edvbld deleted the edvbld:hg branch Sep 10, 2019
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.