Platform-releng/Juno Git Migration
The Eclipse top-level project is investigating migration to Git during the summer of 2011. Development towards both Juno and Indigo SR1 would continue in Git after migration
- 1 Current state
- 2 Issues blocking migration
- 3 Resolved issues
- 4 Issues for after migration
- 5 Timing
- We have been doing test builds fetching the org.eclipse.equinox.p2.* bundles from the git mirror automatically created by the foundation
- This mirror is missing some tag/branch information so isn't reliable for test builds
- Denis set up area where we can run test migrations to Git
- Kim has run a test migration which she will then run a test build on
- Still need to figure out how to exclude binaries from the migration to Git step
- Then we can do a full test migration of all repositories and run a complete build
- Plan item for this work is bug 345479
- We'll try and capture some common CVS workflows in Platform-releng/Git Workflows
Issues blocking migration
Binaries in repositories
We currently check binaries into CVS in several places:
- Base builder
- SWT fragments
- Equinox launcher and security fragments
- Misc platform binaries such as file system, resources
- Archived examples and samples
These binaries bloat the repository which will make cloning repositories painful for developers. We decided on the following action:
- Binaries are instead published to a p2 repository (the native binaries repository)
- Build consumes binaries from p2 repositories and source from Git
- These binary p2 repositories are only used as build input and not intended for wider consumption
- Retention policy likely to be a single release for these binary repositories. Can always regenerate old binaries from source in the future so no need to retain them forever (NOTE: Unfortunately, the statement "Can always regenerate old binaries from source in the future so no need to retain them forever" is almost certainly false. Suggest that we keep all milestone and release binaries indefinitely)
- For developers at dev time, the source projects can have an Ant builder on them which will automatically fetch the corresponding binaries for the source project
Bootstrap process for the base builder becomes:
- wget a stable platform runtime binary (milestone)
- invoke command line p2 director to get the base builder from milestone repository
- We will need a base builder product (bug 324682)
SWT build process:
- SWT has a hudson build for generating their native binaries
- Builder will fetch native source from Git using Git Ant task
- Builder will push resulting fragment to the Eclipse project native binaries repository
Equinox launcher natives:
- Similar to SWT above
Git Ant task
We need a Git Ant task that invokes JGit for fetching SWT source as part of SWT hudson build. See bug 321237. This is apparently done (need to confirm it is available and works for us on all platforms).
Story for maintenance streams
We need to maintain a CVS repository for performing builds on older branches (3.6.2+, 3.5.2+, etc). Until we have a solution for this, we will need to keep our CVS repository writeable after the Git migration. We can delete all content from HEAD in CVS to avoid confusion.
One option we are considering for maintenance is having a read-only CVS repository that mirrors our Git repository. We could then push changes to Git for maintenance streams, and our old builders can pick the change up from the CVS mirror/clone. We need to work with the Foundation staff to see if this is feasible ( bug 34876).
Current thinking is that 3.7.x is built from Git. This means we need to proof that we can build 3.7.1 against Git before we do the migration ( bug 349460).
We need to gather various bits of information to plug into the CVS->Git migration tool:
- Need author information for all committers past and present bug 349350
- Figure out the CVS module -> Git repository mapping for all CVS modules
- Figure out what binaries to exclude from migration, and how to exclude them
- Determine what legacy CVS modules we can omit from migration altogether
- Steps to test the migration.
Git repository granularity
We decided on a single Git repository per ACL. One common Eclipse TLP repository for doc and map files. See bug 345471 for the discussion.
The same holds for Equinox, although Tom considering folding security component into bundles due to lack of active committers. The repositories for Equinox will be:
- Security (maybe)
The Git_Migration_Granularity page documents the proposed bundles per repo. (Nested bundles are assumed to be included by indicating the top level directory).
- Build tags everything that is in master
- If you don't want to contribute to build, put it in another branch
- Eliminate the manual tagging step taken by all teams today
- builds should still be map file based
- We use tagging for two purposes: 1. reproducible builds and 2. bundle version numbers. We need to ensure that if a bundle's contents doesn't change, that the version number doesn't change. Paul W. had some thoughts on how this will be done by actually looking at the commit history.
Issues for after migration
- Renaming of e4 bundles
- Stitching in R4 branch of org.eclipse.ui.workbench that is in separate location bug 349177
Including eGit in Eclipse SDK
Traditionally we have included everything in the SDK needed to build the SDK. This implies including EGit/JGit in the Eclipse SDK. However this introduces a cyclic build dependency which always causes problems and introduces end-game risk. We need to reconsider this policy of including everything we need. Using p2 having multiple "root" features installed and updating them on an ongoing basis is no longer painful. The advantage of putting everything into a single build is perhaps outweighed by the pain of build-time dependency entanglement.
Recommendation: Remove all VCM support (including CVS) from the Eclipse SDK and users install what they need separately.
edit After excluding CVS from the product, the SDK build could still install it and the EGit feature using the director.
Need to discuss this at the PMC call and architecture meeting to find consensus
Git fetch factory
The Git fetch factory still uses command line git. This is not yet ported to JGit but that's not blocking us because our builds all run on a single platform (Linux). Unclear who will do this and when it will happen. In the long term this will be beneficial to remove a specific platform dependency from our build process.
It was ant tasks that were holding this up. bug 349056
Eclipse-Source-Header support for Git still missing. This is needed for Juno but not for Git migration. Consider PDE plan item to support this (possibly in collaboration with EGit team)
See bug 327381
The copyright tool may need to be updated for integration with git.
See bug 345669
Git Ignore file
All of the repos should probably commit a .gitignore file at the base of their repositories. I would imagine that it needs to be done either on each branch that the component thinks is important going forward, or perhaps added as the root commit after the CVS to Git migration has been verified.
An example .gitignore file:
bin/ *~ *.rej *.bak core *.so *.patch javacore.* heapdump.* core.* Snap.* target/
- Run test migrations and test builds
- SWT investigating migration of SWT builder
- Figure out how to preserve branch information in migration
- Migrate Equinox repositories to Git
- Migrate Eclipse TLP repositories