jdk/jdk repository transitions to Git, GitHub and Skara: September 5

Sat Aug 29 10:54:16 UTC 2020

On 8/27/20 5:43 PM, Thomas Stüfe wrote:
> My current work involves working in a named branch at jdk/sandbox, 
> roughly following this flow:
> - committing my changes locally, rather fine grained into my own branch
> - from time to time pushing up to the central hg sandbox repo
> - from time to time pulling in new changes and merging from the default 
> branch
> - from time to time creating diffs for reviews
> 
> I am currently trying to figure out how this approach will change with 
> git and github. I know there are subtle differences in the branching 
> concept between hg and git. I found 
> https://medium.com/@tmvvr/git-for-longtime-mercurial-users-c41f37352fca, 
> which is a good explanation, if somewhat short. Also good and short is 
> https://github.com/sympy/sympy/wiki/Git-hg-rosetta-stone. However, many 
> things are still vague and I guess this will only clear up once I switch.

You are going to want to use a personal fork [0] instead of using the 
sandbox when working with Git, GitHub and Skara. A personal fork allows 
to keep essentially the same workflows as above, but also grants you the 
ability to create pull requests [1]. As noted on the Skara wiki, we 
highly recommend that you read chapters 1 - 3 of the excellent Pro Git 
book [2].

> - You write committers have write access to jdk/sandbox, so I can 
> continue to push my changes in my branch up into the central repository, 
> yes? Will the default branch be protected against accidental pushes, 
> like I believe we did for the hg sandbox?

Yes, this will stay the same. However, as stated above, you are much 
more likely to use your personal fork instead of the sandbox. The 
sandbox can still be beneficial to use for e.g. ad-hoc collaboration.

> - In mercurial I can filter for changes local to my branch via -b (hg 
> log -b <branch name>). Is this possible in git too, since there, a 
> branch AFAIU is only a pointer to a single commit?

Yes :) With git it is `git log master..<branch-name>`. Again, we 
strongly recommend reading through chapter 1 -3 of the Pro Git book [2].

> I am sure more questions will come once the switch is reality...
You are more than welcome to ask questions. Me and Robin will also hang 
out in #openjdk on irc.oftc.net on Sep 7 for a bit quicker turn-around 
time on questions and answers :)

There is also an extensive FAQ available on the Skara wiki [3].

Thanks,
Erik

[0]: https://wiki.openjdk.java.net/display/skara#Skara-Personalforks
[1]: https://wiki.openjdk.java.net/display/skara#Skara-Pullrequests
[2]: https://git-scm.com/book/en/v2
[3]: https://wiki.openjdk.java.net/display/SKARA/FAQ

> Thanks a lot!
> 
> Cheers, Thomas
> 
> 
>     Thanks,
>     Erik
> 
>     [0]: https://hg.openjdk.java.net/jdk/sandbox
>     [1]: https://hg.openjdk.java.net/jdk/jdk
>     [2]: https://openjdk.java.net/census#jdk
>     [3]: https://git.openjdk.java.net/jdk
>     [4]: https://git.openjdk.java.net/jdk-sandbox
>     [5]: https://wiki.openjdk.java.net/display/skara#Skara-Workflow
> 
>      > Thanks, Thomas
>      >
>      >
>      > On Wed, Aug 12, 2020 at 8:57 AM Erik Helin <erik.helin at oracle.com
>     <mailto:erik.helin at oracle.com>
>      > <mailto:erik.helin at oracle.com <mailto:erik.helin at oracle.com>>> wrote:
>      >
>      >     Hi all,
>      >
>      >     We are now getting closer to the jdk/jdk repository [0]
>      >     transitioning to
>      >     Git, GitHub and Skara. JEP 357 [0] and JEP 369 [1] were
>     targeted to JDK
>      >     16 at the end of May 2020 [2]. It was then also communicated
>     that the
>      >     jdk/jdk repository would transition "early September 2020" [3].
>      >
>      >     The exact target date for the transition of the jdk/jdk
>     repository is
>      >     now set to Saturday September 5, 2020. We aim to complete the
>      >     transition
>      >     during the weekend of September 5 - 6, 2020. Starting from
>     September 4
>      >     the Mercurial repository for jdk/jdk [0] will become
>     read-only and the
>      >     Git repository for jdk/jdk [5] will become read-write on Monday
>      >     September 7.
>      >
>      >     If you are an OpenJDK Author, Committer or Reviewer, then
>     please make
>      >     sure you that you are ready for the transition by following the
>      >     "Getting
>      >     Started" guide on the Skara wiki [7]. In particular, make
>     sure that you
>      >     associate your GitHub username and OpenJDK username, see the
>     "Getting
>      >     Started" guide for details. Feel free to try out the new
>     tools and make
>      >     sure that everything works in the OpenJDK playground
>     repository [8].
>      >
>      >     For those of you doing backports to jdk-updates repositories
>     there is a
>      >     Skara CLI tool, git hg-export, that will export commits from
>     an OpenJDK
>      >     Git repository in a format expected by hg and the OpenJDK
>     Mercurial
>      >     repositories [9]. A "clean" backport of a Git commit looks
>     like the
>      >     following:
>      >
>      >     $ git clone https://git.openjdk.java.net/jdk
>      >     $ git -C jdk hg-export <REV> | hg -R /path/to/hg/repo import
>      >
>      >     As part of transitioning the jdk/jdk repository we will also
>     transition
>      >     the jdk/client repository [6]. There is work ongoing that
>     might result
>      >     in jdk/client being archived instead of transitioned, but
>     that work is
>      >     not guaranteed to be done by September 5. We will send out
>     more details
>      >     on this as we get closer.
>      >
>      >     The jdk/submit [10] repository will not be transitioned, the
>     equivalent
>      >     functionality is provided by the /test pull request command [11].
>      >
>      >     There are continuously updated read-only mirrors of the
>     jdk/jdk [5],
>      >     jdk/client [12] and jdk/sandbox [13] repositories available
>     if you want
>      >     to create personal forks ahead of the transition. Note that the
>      >     jdk/jdk15 [14] repository will stay on Mercurial as well as the
>      >     jdk-updates/jdk15u [15] repository (at least for the time being).
>      >
>      >     If you have any questions just send an email to
>      > skara-dev at openjdk.java.net <mailto:skara-dev at openjdk.java.net>
>     <mailto:skara-dev at openjdk.java.net <mailto:skara-dev at openjdk.java.net>>!
>      >
>      >     Thanks,
>      >     Erik and Robin
>      >
>      >     [0]: https://hg.openjdk.java.net/jdk/jdk
>      >     [1]: https://openjdk.java.net/jeps/357
>      >     [2]: https://openjdk.java.net/jeps/369
>      >     [3]:
>      > https://mail.openjdk.java.net/pipermail/jdk-dev/2020-May/004335.html
>      >     [4]:
>      > https://mail.openjdk.java.net/pipermail/jdk-dev/2020-May/004322.html
>      >     [5]: https://github.com/openjdk/jdk
>      >     [6]: https://hg.openjdk.java.net/jdk/client
>      >     [7]:
>      >
>     https://wiki.openjdk.java.net/display/SKARA/Skara#Skara-GettingStarted
>      >     [8]: https://github.com/openjdk/playground
>      >     [9]: https://wiki.openjdk.java.net/display/SKARA/git-hg-export
>      >     [10]: https://hg.openjdk.java.net/jdk/submit
>      >     [11]:
>      >
>     https://wiki.openjdk.java.net/display/SKARA/Pull+Request+Commands#PullRequestCommands-/test
>      >     [12]: https://github.com/jdk/client
>      >     [13]: https://github.com/jdk/jdk-sandbox
>      >     [14]: https://hg.openjdk.java.net/jdk/jdk15
>      >     [15]: https://hg.openjdk.java.net/jdk-updates/jdk15u
>      >
> 