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

cli: add new command hg-export #712

Closed
wants to merge 3 commits into from
Closed

cli: add new command hg-export #712

wants to merge 3 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Aug 6, 2020

Hi all,

please review this patch that adds the new command git hg-export. The git hg-export command prints information about a Git commit in the format expected by hg import (i.e. it is very similar to the hg export --git command). This command is primarily useful for backporting changes from a Git repository to a Mercurial repository as a backporter can now run:

$ git clone https://git.openjdk.java.net/jdk
$ cd jdk
$ git hg-export <REV> | hg -R /path/to/hg/repo/for/jdk11u-dev import -

The command git hg-export will output the commit message in the format used by the OpenJDK Mercurial repositories. The command will also output the correct author and date.

Testing:

  • Manual testing of git hg-export on Linux x64

Thanks,
Erik


Progress

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

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/712/head:pull/712
$ git checkout pull/712

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 6, 2020

👋 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.

Copy link
Member

@rwestberg rwestberg left a comment

Looks good! Perhaps some sort of test would be nice, but can do that later I guess. :)

cli/src/main/java/org/openjdk/skara/cli/GitHgExport.java Outdated Show resolved Hide resolved
@openjdk
Copy link

@openjdk openjdk bot commented Aug 6, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

cli: add new command hg-export

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

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

  • c7890d6: 453: Merge commit not included in notification email
  • 68d7387: 467: git pr create assumes .jcheck/conf file

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate c7890d6c3d09253e1521f0bc46d1e9f29a8bfb4e.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 6, 2020

Webrevs

Co-authored-by: Robin Westberg <robin@westberg.se>
@edvbld
Copy link
Member Author

@edvbld edvbld commented Aug 6, 2020

@rwestberg thanks for reviewing!

@edvbld
Copy link
Member Author

@edvbld edvbld commented Aug 6, 2020

/integrate

@openjdk openjdk bot closed this Aug 6, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 6, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 6, 2020

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

  • c7890d6: 453: Merge commit not included in notification email
  • 68d7387: 467: git pr create assumes .jcheck/conf file

Your commit was automatically rebased without conflicts.

Pushed as commit ff9b82b.

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