Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Hello, I would consider https://bugzilla.wikimedia.org/show_bug.cgi?id=40653 (filed by Daniel Kinzler after one of my comments) as a blocker for this merge. Also Nikerabbit's comments in https://gerrit.wikimedia.org/r/#/c/25736/1/includes/Content.php lines 222 and following would be great to fix before the merge. Cheers! Alexandre Emsenhuber (ialex) Le 3 oct. 2012 à 03:07, Rob Lanphier a écrit : Hi everyone, We now at around the time that we planned to merge the ContentHandler branch in. Questions: * Daniel/others: have you submitted a merge commit for this? If not, do you need help/clarification, or do you have it? * People who reviewed Denny's faux commit[1] and left comments. Any blockers, or mainly stylistic stuff? Everyone else, now is the last call before the merge. Rob [1] Faux commit of ContentHandler branch: https://gerrit.wikimedia.org/r/#/c/25736/ ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Hi everyone, We now at around the time that we planned to merge the ContentHandler branch in. Questions: * Daniel/others: have you submitted a merge commit for this? If not, do you need help/clarification, or do you have it? * People who reviewed Denny's faux commit[1] and left comments. Any blockers, or mainly stylistic stuff? Everyone else, now is the last call before the merge. Rob [1] Faux commit of ContentHandler branch: https://gerrit.wikimedia.org/r/#/c/25736/ ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
That moment of suspense before a big branch merge... *--* *Tyler Romeo* Stevens Institute of Technology, Class of 2015 Major in Computer Science www.whizkidztech.com | tylerro...@gmail.com On Tue, Oct 2, 2012 at 9:07 PM, Rob Lanphier ro...@wikimedia.org wrote: Hi everyone, We now at around the time that we planned to merge the ContentHandler branch in. Questions: * Daniel/others: have you submitted a merge commit for this? If not, do you need help/clarification, or do you have it? * People who reviewed Denny's faux commit[1] and left comments. Any blockers, or mainly stylistic stuff? Everyone else, now is the last call before the merge. Rob [1] Faux commit of ContentHandler branch: https://gerrit.wikimedia.org/r/#/c/25736/ ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Hi, I have tried to create one changeset with the whole content handler for your convenience: https://gerrit.wikimedia.org/r/#/c/25736/ Note that is based on 7ccc77a and needs to get rebased before merge, but the major parts should be there. Since I am not a Git expert, I may have mad it all completely wrong. I tried squashing, but that didn't work, so I created a diff and patched master with it and then submitted that as a changeset to Gerrit... I think some whitespace issue creeped in through that. So, as said, I don't have a clue how useful or correct this changeset is, but I hope it is somehow helping in understanding the change. The actual change to be merged continues to be in the Wikidata branch. Cheers, Denny 2012/9/27 Rob Lanphier ro...@wikimedia.org: On Thu, Sep 27, 2012 at 10:54 AM, Roan Kattouw roan.katt...@gmail.com wrote: Yes and no. The person that merges the branch can create a merge commit and submit that for review (git checkout -b mergewikidata master git merge wikidata git review) but Gerrit will not show the diff properly: it'll either show just the conflict resolutions, or nothing at all. You can view the full diff by fetching the commit on your localhost and using standard git tools (e.g. git review -d 12345 git show), but you won't be able to use inline comments quite as nicely. Someone could create a faux commit (with DO NOT MERGE on it) which is not a merge commit, but a fully squashed, rebased single commit. That would give a target for inline review comments. I'm not volunteering to do that myself, but anyone could do that, and drop a comment on bug 38622. Rob ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l -- Project director Wikidata Wikimedia Deutschland e.V. | Obentrautstr. 72 | 10963 Berlin Tel. +49-30-219 158 26-0 | http://wikimedia.de Wikimedia Deutschland - Gesellschaft zur Förderung Freien Wissens e.V. Eingetragen im Vereinsregister des Amtsgerichts Berlin-Charlottenburg unter der Nummer 23855 B. Als gemeinnützig anerkannt durch das Finanzamt für Körperschaften I Berlin, Steuernummer 27/681/51985. ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Thanks Denny. This is pretty helpful for looking at the exact changes being made. *--* *Tyler Romeo* Stevens Institute of Technology, Class of 2015 Major in Computer Science www.whizkidztech.com | tylerro...@gmail.com On Sat, Sep 29, 2012 at 6:46 AM, Denny Vrandečić denny.vrande...@wikimedia.de wrote: Hi, I have tried to create one changeset with the whole content handler for your convenience: https://gerrit.wikimedia.org/r/#/c/25736/ Note that is based on 7ccc77a and needs to get rebased before merge, but the major parts should be there. Since I am not a Git expert, I may have mad it all completely wrong. I tried squashing, but that didn't work, so I created a diff and patched master with it and then submitted that as a changeset to Gerrit... I think some whitespace issue creeped in through that. So, as said, I don't have a clue how useful or correct this changeset is, but I hope it is somehow helping in understanding the change. The actual change to be merged continues to be in the Wikidata branch. Cheers, Denny 2012/9/27 Rob Lanphier ro...@wikimedia.org: On Thu, Sep 27, 2012 at 10:54 AM, Roan Kattouw roan.katt...@gmail.com wrote: Yes and no. The person that merges the branch can create a merge commit and submit that for review (git checkout -b mergewikidata master git merge wikidata git review) but Gerrit will not show the diff properly: it'll either show just the conflict resolutions, or nothing at all. You can view the full diff by fetching the commit on your localhost and using standard git tools (e.g. git review -d 12345 git show), but you won't be able to use inline comments quite as nicely. Someone could create a faux commit (with DO NOT MERGE on it) which is not a merge commit, but a fully squashed, rebased single commit. That would give a target for inline review comments. I'm not volunteering to do that myself, but anyone could do that, and drop a comment on bug 38622. Rob ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l -- Project director Wikidata Wikimedia Deutschland e.V. | Obentrautstr. 72 | 10963 Berlin Tel. +49-30-219 158 26-0 | http://wikimedia.de Wikimedia Deutschland - Gesellschaft zur Förderung Freien Wissens e.V. Eingetragen im Vereinsregister des Amtsgerichts Berlin-Charlottenburg unter der Nummer 23855 B. Als gemeinnützig anerkannt durch das Finanzamt für Körperschaften I Berlin, Steuernummer 27/681/51985. ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
On Sep 25, 2012 12:15 PM, IAlex ialex.w...@gmail.com wrote: Would it be possible to have the whole changes as an changeset on Gerrit? This would make review and comments much easier than having to do this on this list. Yes and no. The person that merges the branch can create a merge commit and submit that for review (git checkout -b mergewikidata master git merge wikidata git review) but Gerrit will not show the diff properly: it'll either show just the conflict resolutions, or nothing at all. You can view the full diff by fetching the commit on your localhost and using standard git tools (e.g. git review -d 12345 git show), but you won't be able to use inline comments quite as nicely. Roan ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
On Thu, Sep 27, 2012 at 10:54 AM, Roan Kattouw roan.katt...@gmail.com wrote: Yes and no. The person that merges the branch can create a merge commit and submit that for review (git checkout -b mergewikidata master git merge wikidata git review) but Gerrit will not show the diff properly: it'll either show just the conflict resolutions, or nothing at all. You can view the full diff by fetching the commit on your localhost and using standard git tools (e.g. git review -d 12345 git show), but you won't be able to use inline comments quite as nicely. Someone could create a faux commit (with DO NOT MERGE on it) which is not a merge commit, but a fully squashed, rebased single commit. That would give a target for inline review comments. I'm not volunteering to do that myself, but anyone could do that, and drop a comment on bug 38622. Rob ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
[Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Hi everyone, Assuming no one finds any substantive issues, we plan on merging the ContentHandler feature (Wikidata branch) early next week, in time for 1.20wmf14 (assuming we're still calling this the 1.20 series then). The tracking bug for that is here: https://bugzilla.wikimedia.org/show_bug.cgi?id=38622 The tree is here: https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=tree;h=refs/heads/Wikidata;hb=refs/heads/Wikidata ...and recent commits are here: https://gerrit.wikimedia.org/r/#/q/status:merged+project:mediawiki/core+branch:Wikidata,n,z We'd like to get it in right after a deployment branch point so that it has some time to settle in master before we foist it on everyone. Please take a look at this branch, and raise any issues with the branch or this plan on list. Thanks! Rob ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Hello, Would it be possible to have the whole changes as an changeset on Gerrit? This would make review and comments much easier than having to do this on this list. Cheers! Alexandre Emsenhuber (ialex) Le 25 sept. 2012 à 19:16, Rob Lanphier a écrit : Hi everyone, Assuming no one finds any substantive issues, we plan on merging the ContentHandler feature (Wikidata branch) early next week, in time for 1.20wmf14 (assuming we're still calling this the 1.20 series then). The tracking bug for that is here: https://bugzilla.wikimedia.org/show_bug.cgi?id=38622 The tree is here: https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=tree;h=refs/heads/Wikidata;hb=refs/heads/Wikidata ...and recent commits are here: https://gerrit.wikimedia.org/r/#/q/status:merged+project:mediawiki/core+branch:Wikidata,n,z We'd like to get it in right after a deployment branch point so that it has some time to settle in master before we foist it on everyone. Please take a look at this branch, and raise any issues with the branch or this plan on list. Thanks! Rob ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
On Tue, Sep 25, 2012 at 7:14 PM, IAlex ialex.w...@gmail.com wrote: Would it be possible to have the whole changes as an changeset on Gerrit? This would make review and comments much easier than having to do this on this list. is https://gerrit.wikimedia.org/r/#/q/status:merged+project:mediawiki/core+branch:Wikidata,n,z sufficient? (copied from the first message on this thread) -Jeremy ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
I think it would be nice to have a changeset in Gerrit showing the actual merge. I'm not sure how this would be possible with Gerrit, but it would definitely be useful as a final review (and for QA purposes). *--* *Tyler Romeo* Stevens Institute of Technology, Class of 2015 Major in Computer Science www.whizkidztech.com | tylerro...@gmail.com On Tue, Sep 25, 2012 at 3:20 PM, Jeremy Baron jer...@tuxmachine.com wrote: On Tue, Sep 25, 2012 at 7:14 PM, IAlex ialex.w...@gmail.com wrote: Would it be possible to have the whole changes as an changeset on Gerrit? This would make review and comments much easier than having to do this on this list. is https://gerrit.wikimedia.org/r/#/q/status:merged+project:mediawiki/core+branch:Wikidata,n,z sufficient? (copied from the first message on this thread) -Jeremy ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Content handler feature merge (Wikidata branch) scheduled early next week
Hello, Having to dispatch comments over hunderds of commits is probably not the best idea, since I'm sure some of them will get lost. I would prefer having a central to do this instead. Cheers! Alexandre Emsenhuber (ialex) Le 25 sept. 2012 à 21:20, Jeremy Baron a écrit : On Tue, Sep 25, 2012 at 7:14 PM, IAlex ialex.w...@gmail.com wrote: Would it be possible to have the whole changes as an changeset on Gerrit? This would make review and comments much easier than having to do this on this list. is https://gerrit.wikimedia.org/r/#/q/status:merged+project:mediawiki/core+branch:Wikidata,n,z sufficient? (copied from the first message on this thread) -Jeremy ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
