Git/Conversion/status

Last update on: 2012-07-monthly

2011-09-22
Rob Lanphier proposed a draft plan on the wikitech-l mailing list.

2011-09-30
Rob Lanphier proposed a draft plan to proceed to a migration to git over the following months, and got a positive response from developers.

2011-10-31
Chad Horohoe started to prepare for the migration to git; he wrote a script to compare LDAP accounts to the information stored in Code review, and prepared for conversion tests from the current Subversion repository. An important step in the conversion is having names and email addresses for all committers, since neither Git nor Gerrit function well without them. As of this writing, 26 committers do not have any contact information, and 25 have a name but no e-mail address. Please help by filling in the names of committers you know. 

2011-11-16
Chad is down to one last email address of a committer to confirm, then a full import will happen. He has already started a partial import (up to r100000), and will do the complete import once that is done.

2011-11-30
Chad Horohoe got a lot of help from the community on identifying unknown committers; user mapping is now complete. Gitorious was installed on a virtual machine, and a test git conversion of the MediaWiki code repository is now imminent. Meanwhile, there have also been discussions about e-mail aliases for LDAP users, to avoid disclosing private e-mail addresses. Chad and Brion Vibber worked on changes to the development workflow introduced by the move to git (e.g., when continuous integration tests get run).

2011-12-19
Have currently working conversion of MediaWiki core in Gerrit and are sorting out the permission model. We're having two meetings this week (both on Dec. 19th) to help hammer out the details. Join us in #wikimedia-dev!

2011-12-31
The rules to convert  have been finished and a [//gerrit.wikimedia.org/r/gitweb?p=test/mediawiki/core.git;a=summary test repository] is now available. Chad Horohoe is now working on convert rules for extensions, and on user permissions.

2012-01-31
The MediaWiki  repository has been successfully converted with branches. Another upcoming test repository will include release tags, and extension projects will be set up shortly.

2012-02-23
<section begin=2012-02-23/>The migration of MediaWiki core and of extensions used on WMF sites is now scheduled for the first weekend in March (3 March 2012). Sumana Harihareswara and Chad Horohoe wrote a blog entry to answer some common questions about the migration. Starting on 24 February WMF Engineering will start making strong efforts to train the development community in using Git and Gerrit, including screensharing trainings.<section end=2012-02-23/>

2012-02-29
<section begin=2012-02-29/>The migration of MediaWiki core and of extensions used on WMF sites is now tentatively scheduled for 21 March 2012. Sumana Harihareswara and Chad Horohoe wrote a blog entry to answer some common questions about the migration. WMF Engineering is making strong efforts to train the development community in using Git and Gerrit, including documentation and trainings via screensharing on February 27 and 28. We will be moving Gerrit infrastructure to Ashburn, as the Tampa server we're using can't handle the load.<section end=2012-02-29/>

2012-03-22
<section begin=2012-03-22/>We've now moved MediaWiki core and WMF-deployed extensions over to Git and Gerrit, and for those directories Subversion is now read-only. We've communicated links and workflow planning, and the new procedure to add and remove people from Gerrit project owner groups.<section end=2012-03-22/>

2012-03-31
<section begin=2012-03-31/>We've now moved MediaWiki core and WMF-deployed extensions over to Git and Gerrit, and for those directories Subversion is now read-only. We've communicated links and workflow planning, and the new procedure to add and remove people from Gerrit project owner groups. A summary of the move was published in the Wikipedia Signpost.<section end=2012-03-31/>

2012-04-13
<section begin=2012-04-13/>MediaWiki core and all WMF-deployed extensions are getting into regular development cycles. The first batch of non-WMF extensions was migrated on 6 April, with only minor issues. Many small issues in Gerrit/Git have been fixed over the past week. Notably, automated localization commits have been fixed and will resume on Monday, April 16. On April 10, we cut the first WMF deployment branch (1.20wmf1) and pushed it to test2.wikipedia.org and mediawiki.org, with success. The priorities for Gerrit are currently fixing our UTF-8 problem, improving Gerrit integration with IRC/e-mails, making project/user information more discoverable, and upgrading Gerrit to 2.3 in the next 2 or 3 weeks.<section end=2012-04-13/>

2012-04-monthly
<section begin=2012-04-monthly/>MediaWiki core and all extensions deployed on Wikimedia sites are getting into regular development cycles. The second group of extensions were migrated on April 27. We've also branched and released 1.20wmf1 to most Wikimedia sites. The priorities for Gerrit are currently fixing our UTF-8 problem, improving Gerrit integration with IRC and e-mail, making project/user information more discoverable, and upgrading Gerrit to 2.3 in the next week or so.<section end=2012-04-monthly/>

2012-05-06
<section begin=2012-05-07/>We successfully upgraded to Gerrit 2.3 on Friday, May 4th. This brings a variety of fixes and features--notably, a less cluttered diff interface and the ability to have the "mediawiki/extensions" meta-repo that holds all extensions be automatically updated. Several new repositories were created for extensions and other uses, including a repository for packaging MediaWiki to easily install on Windows servers. We also managed to fix our long-standing UTF-8 issue so users can all now use unicode for their commits, comments and usernames without fear (there is one minor issue remaining with IRC output). The coming week will focus on improving IRC/logging output, and fixing the auto-commits of localization updates from Translatewiki. <section end=2012-05-07/>

2012-05-monthly
<section begin="2012-05-monthly"/>Chad Horohoe and Ryan Lane upgraded Gerrit to version 2.3, which brings a variety of fixes and features; notably, a less cluttered diff interface, and the ability to have the "mediawiki/extensions" meta-repository that holds all extensions be automatically updated. Many new repositories were created for extensions and other uses, including a repository for packaging MediaWiki to easily install on Windows servers. We have also managed to fix our long-standing UTF-8 issues with help from Marcin Cieślak, so users can all now use Unicode for their commits, comments and usernames. Image changes can now be shown via the UI, rather than being downloaded as a ZIP file to be compared locally (example). Brion Vibber has agreed to lead a process for evaluating Gerrit (and possible alternatives), which will conclude in early August. David Schoonover is currently writing up a list of alternatives to Gerrit which he plans to publish on mediawiki.org and announce on wikitech-l.<section end="2012-05-monthly"/>

2012-06-21
<section begin="2012-06-21"/>Created a bunch of new repositories in Gerrit this week--including all extensions that are enabled on Translatewiki.net. Gerrit 2.4.1 has been released, and have begun testing it so we can upgrade our installation.<section end="2012-06-21"/>

2012-06-monthly
<section begin="2012-06-monthly"/>This has been a very busy month for Gerrit. The creation of new projects continues; this month saw every extension deployed on Translatewiki moved to Git. During the week of June 25th, we experienced some downtime with Gerrit due to search engine crawlers overloading the server. Also that week, lots of improvements to IRC logging were made, although discussion continues on how to make the bots more effective. We have scheduled an upgrade of Gerrit to the 2.4 release for the week of July 2nd--this will bring the much desired "Rebase button" to Gerrit which should lighten users' workload for trivial merges.<section end="2012-06-monthly"/>

2012-07-monthly
<section begin="2012-07-monthly"/>We're in the process of evaluating Gerrit and its alternatives as a code review tool. Chad Horohoe and Ryan Lane upgraded our Gerrit instance to 2.4, which provided many incremental fixes and small features (e.g. the "rebase" button). Ryan and Asher Feldman migrated the Gerrit database to our Ashburn datacenter, which resulted in a big performance boost.<section end="2012-07-monthly"/>