I am now the project manager for MediaWiki's switch to Git and Gerrit. I'm working to ensure that we hit the March 21st migration date. I am prioritizing issues and finding workarounds.
I believe the lack of arbitrary labels/tags on changes is a big workflow problem.[0] The current workaround is to use "topic branches" (Gerrit calls them topics; Git calls them branches). To do that, you have to use git-review. So if you have tried and failed to install and use git-review, please speak up ASAP so we can make our git-review instructions and workflow more robust.
And can any of you help make native packages for git-review that work on Mac and Windows?[1]
Thanks.
[0] https://labsconsole.wikimedia.org/wiki/Gerrit_bugs_that_matter#Issue_287:_Ar... [1] https://bugzilla.wikimedia.org/show_bug.cgi?id=35145
On Sat, Mar 10, 2012 at 7:20 PM, Sumana Harihareswara sumanah@wikimedia.org wrote:
I believe the lack of arbitrary labels/tags on changes is a big workflow problem.[0] The current workaround is to use "topic branches" (Gerrit calls them topics; Git calls them branches). To do that, you have to use git-review.
That's not entirely true. git-review just contains some code to guess an appropriate topic (bug number in commit summary if available, local branch name otherwise) and then uses a regular git command to submit the change with a topic. The command is:
git push gerrit HEAD:refs/for/master
to push something without a topic, and
git push gerrit HEAD:refs/for/master/foobar
to push something with 'foobar' as the topic. git-review is really just sugar coating around these hideous 'git push' commands.
Roan
Sumana Harihareswara wrote: <snip>
And can any of you help make native packages for git-review that work on Mac and Windows?[1]
<snip>
I have no idea who started spreading that git-review could not be installed on Mac OS X. It is already packaged as a python package.
The magic commands are:
sudo easy_install pip sudo pip install git-review
pip is python package manager which is installed with Mac OS X.
I am amending bug 35145.
It should be noted that pip is no longer included with Mac OS X (tested on basic Lion and Mountain Lion installations).
However, installing git-review for Mac is still relatively easy to do: https://www.mediawiki.org/wiki/Git/Workflow#Mac_OS_X_via_Terminal
Perhaps people were referring to a different conversation about no Mac GUIs supporting git-review? Which as far as I know is still true. I'm still not clear on that whole topic - the wikipage for the GUIs doesn't seem to mention git-review..
-greg aka varnent
On Mar 12, 2012, at 5:10 AM, Antoine Musso hashar+wmf@free.fr wrote:
Sumana Harihareswara wrote:
<snip> > And can any of you help make native packages for git-review that work on > Mac and Windows?[1] <snip> > [1] https://bugzilla.wikimedia.org/show_bug.cgi?id=35145
I have no idea who started spreading that git-review could not be installed on Mac OS X. It is already packaged as a python package.
The magic commands are:
sudo easy_install pip sudo pip install git-review
pip is python package manager which is installed with Mac OS X.
I am amending bug 35145.
-- Antoine "hashar" Musso
Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
I wrote:
So if you have tried and failed to install and use git-review, please speak up ASAP so we can make our git-review instructions and workflow more robust.
I'm not hearing anyone saying that this is still failing for them. And, as Roan pointed out, people can use
git push gerrit HEAD:refs/for/master/foobar
to push a commit with "foobar" as the name of the topic branch. So I'm calling this a nice-to-have. https://bugzilla.wikimedia.org/show_bug.cgi?id=35145 is no longer a blocker for the March 21st migration. Speak up if you are still unable to use git-review, and someone will help you. Thanks for all the docs improvements, everyone.
Sumana Harihareswara sumanah@wikimedia.org wrote:
I wrote:
So if you have tried and failed to install and use git-review, please speak up ASAP so we can make our git-review instructions and workflow more robust.
I'm not hearing anyone saying that this is still failing for them. And, as Roan pointed out, people can use
There is still some problem with pushing to
/test/mediawiki/extensions/examples
with git-review:
http://tools.wikimedia.pl/~saper/fail/gerrit-fail-01
or without:
http://tools.wikimedia.pl/~saper/fail/gerrit-fail-02
Seems to be something because of configuration:
https://labsconsole.wikimedia.org/w/index.php?title=Gerrit_bugs_that_matter&...
https://labsconsole.wikimedia.org/wiki/File:Gerrit_branch_permissions_wrong....
notice refs/for/refs/* ???? - but changing this apparently does not help.
Fortunately, /test/mediawiki/core works fine for me.
//Saper
wikitech-l@lists.wikimedia.org